diff --git a/Spigot-API-Patches/0001-POM-changes.patch b/Spigot-API-Patches/0001-POM-changes.patch index 0c8802d108..5eae4b7fb4 100644 --- a/Spigot-API-Patches/0001-POM-changes.patch +++ b/Spigot-API-Patches/0001-POM-changes.patch @@ -1,11 +1,11 @@ -From 2b5e59d5fc6cb5073abf121c11010c2f16787f2b Mon Sep 17 00:00:00 2001 +From 5f6c18daf8f095f2f60a38998cfcb0ee28d0e8ef 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 186405ba..9975ba9a 100644 +index 186405ba1..9975ba9ae 100644 --- a/pom.xml +++ b/pom.xml @@ -2,34 +2,28 @@ @@ -120,5 +120,5 @@ index 186405ba..9975ba9a 100644 true -- -2.26.1 +2.26.2 diff --git a/Spigot-API-Patches/0002-Add-FastUtil-to-Bukkit.patch b/Spigot-API-Patches/0002-Add-FastUtil-to-Bukkit.patch index dcb571f546..7c15a34ba4 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 747cc281e224953dc859384efe4466cb165a90ef Mon Sep 17 00:00:00 2001 +From 978cc75c386e674edf105135d3a558803c630393 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 ce09baeab..3cfbff14b 100644 +index 9975ba9ae..e8d9982bd 100644 --- a/pom.xml +++ b/pom.xml @@ -49,6 +49,12 @@ @@ -23,5 +23,5 @@ index ce09baeab..3cfbff14b 100644 commons-lang commons-lang -- -2.25.1 +2.26.2 diff --git a/Spigot-API-Patches/0003-Paper-Utils.patch b/Spigot-API-Patches/0003-Paper-Utils.patch index 38a29d0e06..1cf1fa6378 100644 --- a/Spigot-API-Patches/0003-Paper-Utils.patch +++ b/Spigot-API-Patches/0003-Paper-Utils.patch @@ -1,4 +1,4 @@ -From d7f401b6507cf6813a6e17cd0ad3df6d35d3a9e7 Mon Sep 17 00:00:00 2001 +From 9941a3d6ebbd8e1c89d8cddc53c81a9e3e14111f Mon Sep 17 00:00:00 2001 From: Aikar Date: Sat, 23 Feb 2019 11:26:21 -0500 Subject: [PATCH] Paper Utils @@ -27,5 +27,5 @@ index 000000000..9db0056ab + +} -- -2.25.1 +2.26.2 diff --git a/Spigot-API-Patches/0004-Timings-v2.patch b/Spigot-API-Patches/0004-Timings-v2.patch index 44de6496aa..56a3c36e01 100644 --- a/Spigot-API-Patches/0004-Timings-v2.patch +++ b/Spigot-API-Patches/0004-Timings-v2.patch @@ -1,4 +1,4 @@ -From 1765e5585c2c52e2ea84b77aeaeccef7c5e4192e Mon Sep 17 00:00:00 2001 +From b5043839f6c38e559c6029dd6d47979dfce48d83 Mon Sep 17 00:00:00 2001 From: Aikar Date: Mon, 29 Feb 2016 18:48:17 -0600 Subject: [PATCH] Timings v2 @@ -4091,5 +4091,5 @@ index 44badfedc..3cbe5c2bb 100644 + } -- -2.25.1 +2.26.2 diff --git a/Spigot-API-Patches/0005-Player-affects-spawning-API.patch b/Spigot-API-Patches/0005-Player-affects-spawning-API.patch index 039e2b0302..9f384b44b9 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 f09bdcb55acc96a1cf4000e915a77b81497de271 Mon Sep 17 00:00:00 2001 +From 57863f551ef2baa2f507d9ab44b321548127e6b4 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 bfbe775fc..41cb8b377 100644 * Update the list of commands sent to the client. *
-- -2.25.1 +2.26.2 diff --git a/Spigot-API-Patches/0006-Add-getTPS-method.patch b/Spigot-API-Patches/0006-Add-getTPS-method.patch index 6efb3aaa02..3405c5e3de 100644 --- a/Spigot-API-Patches/0006-Add-getTPS-method.patch +++ b/Spigot-API-Patches/0006-Add-getTPS-method.patch @@ -1,4 +1,4 @@ -From 38341660e29303cac1ddb8398e367c30309d0392 Mon Sep 17 00:00:00 2001 +From 8f5b30551af6b64ae50e49b7c46d754cfc06ffa5 Mon Sep 17 00:00:00 2001 From: Aikar Date: Mon, 29 Feb 2016 17:24:57 -0600 Subject: [PATCH] Add getTPS method @@ -48,5 +48,5 @@ index fad4e9292..f0dba56dc 100644 * Get the advancement specified by this key. * -- -2.25.1 +2.26.2 diff --git a/Spigot-API-Patches/0007-Entity-Origin-API.patch b/Spigot-API-Patches/0007-Entity-Origin-API.patch index b8fd7a5afc..6729a0bcf6 100644 --- a/Spigot-API-Patches/0007-Entity-Origin-API.patch +++ b/Spigot-API-Patches/0007-Entity-Origin-API.patch @@ -1,4 +1,4 @@ -From fe1924a542c1c342b0c6d8e83c026b6f608216dc Mon Sep 17 00:00:00 2001 +From 0fad6352b060486f735ee07c5d5fc55c2cb67351 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 5a8789324..3022b4a27 100644 + } } -- -2.25.1 +2.26.2 diff --git a/Spigot-API-Patches/0008-Version-Command-2.0.patch b/Spigot-API-Patches/0008-Version-Command-2.0.patch index 135fa2386c..73ab12f9c4 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 eb32e3f7a1965a7b973da5155617dc917201793b Mon Sep 17 00:00:00 2001 +From 80c67d85cde46ffd7331e67ea1ccc4697a69d2ce 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 cbce52444..0486abd19 100644 try { BufferedReader reader = Resources.asCharSource( -- -2.25.1 +2.26.2 diff --git a/Spigot-API-Patches/0009-Add-PlayerLocaleChangeEvent.patch b/Spigot-API-Patches/0009-Add-PlayerLocaleChangeEvent.patch index a2c9714c3e..8b42dfa952 100644 --- a/Spigot-API-Patches/0009-Add-PlayerLocaleChangeEvent.patch +++ b/Spigot-API-Patches/0009-Add-PlayerLocaleChangeEvent.patch @@ -1,4 +1,4 @@ -From a986444a1c2cce777677717b45e92227b9c9e192 Mon Sep 17 00:00:00 2001 +From 643904b85838b4e2467b141e3302e90d8e32d1f4 Mon Sep 17 00:00:00 2001 From: Isaac Moore Date: Mon, 29 Feb 2016 18:02:25 -0600 Subject: [PATCH] Add PlayerLocaleChangeEvent @@ -61,5 +61,5 @@ index 000000000..29dd763a9 + } +} -- -2.25.1 +2.26.2 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 d0d6665f06..c9282723aa 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 893176893dceda54d5679ae1c52bddc6e44d2068 Mon Sep 17 00:00:00 2001 +From f135c9a8ce4932a9e7959e1b37523bb80fe444cc 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 41cb8b377..a985431e5 100644 /** -- -2.25.1 +2.26.2 diff --git a/Spigot-API-Patches/0011-Add-BeaconEffectEvent.patch b/Spigot-API-Patches/0011-Add-BeaconEffectEvent.patch index 5ca5c5d16b..7494bc7c25 100644 --- a/Spigot-API-Patches/0011-Add-BeaconEffectEvent.patch +++ b/Spigot-API-Patches/0011-Add-BeaconEffectEvent.patch @@ -1,4 +1,4 @@ -From 2aa65d30322969ef1977dfbb7e972747b19e6398 Mon Sep 17 00:00:00 2001 +From ad5e2c1dff96cd282de8d908b8d35a90b04daf29 Mon Sep 17 00:00:00 2001 From: Byteflux Date: Mon, 29 Feb 2016 18:09:40 -0600 Subject: [PATCH] Add BeaconEffectEvent @@ -97,5 +97,5 @@ index 000000000..978813b94 + } +} -- -2.25.1 +2.26.2 diff --git a/Spigot-API-Patches/0012-Add-PlayerInitialSpawnEvent.patch b/Spigot-API-Patches/0012-Add-PlayerInitialSpawnEvent.patch index f60a8eb66a..a1469f4ec6 100644 --- a/Spigot-API-Patches/0012-Add-PlayerInitialSpawnEvent.patch +++ b/Spigot-API-Patches/0012-Add-PlayerInitialSpawnEvent.patch @@ -1,4 +1,4 @@ -From 42d1bc471b8c73b4b00d236ae4e45ee6982da101 Mon Sep 17 00:00:00 2001 +From 19fc087b4ae7ad9562925fba66a2b5888a8be51e 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 00000000..8b1fdb9d +index 000000000..8b1fdb9d2 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/event/player/PlayerInitialSpawnEvent.java @@ -0,0 +1,16 @@ @@ -28,5 +28,5 @@ index 00000000..8b1fdb9d + } +} -- -2.25.1 +2.26.2 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 2b80cf1cc2..5593dbfed0 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,4 +1,4 @@ -From 62da1f0f47b50b3fc2004268c2da2523d7d5817a Mon Sep 17 00:00:00 2001 +From 4d288db916b66cbdea9482b224e4a0e39764765a 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 @@ -20,5 +20,5 @@ index 50a51394f..5cc37eeed 100644 // Perhaps abort here, rather than continue going, but as it stands, -- -2.25.1 +2.26.2 diff --git a/Spigot-API-Patches/0014-Expose-server-CommandMap.patch b/Spigot-API-Patches/0014-Expose-server-CommandMap.patch index 88d9f232f7..69e7aa0993 100644 --- a/Spigot-API-Patches/0014-Expose-server-CommandMap.patch +++ b/Spigot-API-Patches/0014-Expose-server-CommandMap.patch @@ -1,4 +1,4 @@ -From 5d59f9c5f1e3c3a4121cfe62acf8990497c5f23f Mon Sep 17 00:00:00 2001 +From a8c8b3a84cd77647be69e7621118be44c2d8216a Mon Sep 17 00:00:00 2001 From: kashike Date: Mon, 29 Feb 2016 19:48:59 -0600 Subject: [PATCH] Expose server CommandMap @@ -49,5 +49,5 @@ index f0dba56dc..af21bb1aa 100644 * Get the advancement specified by this key. * -- -2.25.1 +2.26.2 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 d72c197cc6..ddd0a6f989 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 88db0ef7068bb5d1eb219c6185763ae53da38629 Mon Sep 17 00:00:00 2001 +From a5c0d8758c2a44b94be4d8d868c1eac0b2f30e46 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 @@ -111,5 +111,5 @@ index a985431e5..dd6adedb6 100644 * Forces an update of the player's entire inventory. * -- -2.25.1 +2.26.2 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 2db752579d..e754662463 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 6bac0b2cdf54dd3ded7833db7e3c36904df3e51c Mon Sep 17 00:00:00 2001 +From f6c5314caaf3750d44dd2fa7362118ce38ddf2e9 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 @@ -513,5 +513,5 @@ index dd6adedb6..3d07467a4 100644 /** -- -2.25.1 +2.26.2 diff --git a/Spigot-API-Patches/0017-Add-exception-reporting-event.patch b/Spigot-API-Patches/0017-Add-exception-reporting-event.patch index facac30e13..34986599fe 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 4510c1ac6e1ad5b0e111a39d9ae63c37bf751b46 Mon Sep 17 00:00:00 2001 +From d4795bab801af08aaa07c753e5b16fe18401c5f8 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 c548911c4..9a5fe8ca4 100644 } } -- -2.25.1 +2.26.2 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 8846c11646..2c7a059b1f 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 d55149dcb67c6bfd3e31d8fbc98345e02abf0175 Mon Sep 17 00:00:00 2001 +From 3162dd0d7459bac922daf980c3da224efdbee977 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 @@ -26,5 +26,5 @@ index 46b119017..05167fb34 100644 public ServerEvent(boolean isAsync) { -- -2.25.1 +2.26.2 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 139fabb9d5..19afe38773 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,4 +1,4 @@ -From 8ae5dc71f1abb6e3a32e468bde32e1783b510380 Mon Sep 17 00:00:00 2001 +From 313da29d469b333104e1e6e5f0053a9f80f5c2d9 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 @@ -40,5 +40,5 @@ index a9020ecc7..d3b3a8bf9 100644 + // Paper end } -- -2.25.1 +2.26.2 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 a1cebde7bc..05f5cd79c3 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,4 +1,4 @@ -From 18d38fdbc6aa79a3105ee7197bfc386a6a46db71 Mon Sep 17 00:00:00 2001 +From 33cd6ad8726b16cc04108d438d653657726c03a5 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 @@ -29,5 +29,5 @@ index 203d135f1..52541e496 100644 + // Paper end } -- -2.25.1 +2.26.2 diff --git a/Spigot-API-Patches/0021-Complete-resource-pack-API.patch b/Spigot-API-Patches/0021-Complete-resource-pack-API.patch index 9c5f2ffb01..0b894ba91f 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 1f8c16b78f72d2da23b0c5c15886d3f467e1480f Mon Sep 17 00:00:00 2001 +From 3a2cee7866bd2596f7c7b43bc49f547afb68598c 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 b98195650..4c2102a11 100644 * Gets the status of this pack. * -- -2.25.1 +2.26.2 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 f49571fa2e..bf100d0e27 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 a1eaf7d5b1995612788c21b799931fd7af0fa46c Mon Sep 17 00:00:00 2001 +From 2224d91ab552d71eb43c7d8c047c8a90d7e5765f 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,7 +6,7 @@ Subject: [PATCH] Use ASM for event executors. Uses method handles for private or static methods. diff --git a/pom.xml b/pom.xml -index e8d9982b..661d109f 100644 +index e8d9982bd..661d109f7 100644 --- a/pom.xml +++ b/pom.xml @@ -128,6 +128,17 @@ @@ -29,7 +29,7 @@ index e8d9982b..661d109f 100644 diff --git a/src/main/java/com/destroystokyo/paper/event/executor/MethodHandleEventExecutor.java b/src/main/java/com/destroystokyo/paper/event/executor/MethodHandleEventExecutor.java new file mode 100644 -index 00000000..5b28e9b1 +index 000000000..5b28e9b1d --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/event/executor/MethodHandleEventExecutor.java @@ -0,0 +1,42 @@ @@ -77,7 +77,7 @@ index 00000000..5b28e9b1 +} diff --git a/src/main/java/com/destroystokyo/paper/event/executor/StaticMethodHandleEventExecutor.java b/src/main/java/com/destroystokyo/paper/event/executor/StaticMethodHandleEventExecutor.java new file mode 100644 -index 00000000..c8367242 +index 000000000..c83672427 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/event/executor/StaticMethodHandleEventExecutor.java @@ -0,0 +1,43 @@ @@ -126,7 +126,7 @@ index 00000000..c8367242 +} diff --git a/src/main/java/com/destroystokyo/paper/event/executor/asm/ASMEventExecutorGenerator.java b/src/main/java/com/destroystokyo/paper/event/executor/asm/ASMEventExecutorGenerator.java new file mode 100644 -index 00000000..b6e7d8ee +index 000000000..b6e7d8ee8 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/event/executor/asm/ASMEventExecutorGenerator.java @@ -0,0 +1,47 @@ @@ -179,7 +179,7 @@ index 00000000..b6e7d8ee +} diff --git a/src/main/java/com/destroystokyo/paper/event/executor/asm/ClassDefiner.java b/src/main/java/com/destroystokyo/paper/event/executor/asm/ClassDefiner.java new file mode 100644 -index 00000000..beed9e6e +index 000000000..beed9e6e0 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/event/executor/asm/ClassDefiner.java @@ -0,0 +1,35 @@ @@ -220,7 +220,7 @@ index 00000000..beed9e6e +} diff --git a/src/main/java/com/destroystokyo/paper/event/executor/asm/SafeClassDefiner.java b/src/main/java/com/destroystokyo/paper/event/executor/asm/SafeClassDefiner.java new file mode 100644 -index 00000000..ac99477e +index 000000000..ac99477e9 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/event/executor/asm/SafeClassDefiner.java @@ -0,0 +1,66 @@ @@ -292,7 +292,7 @@ index 00000000..ac99477e +} diff --git a/src/main/java/com/destroystokyo/paper/utils/UnsafeUtils.java b/src/main/java/com/destroystokyo/paper/utils/UnsafeUtils.java new file mode 100644 -index 00000000..72e48e8e +index 000000000..72e48e8ef --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/utils/UnsafeUtils.java @@ -0,0 +1,35 @@ @@ -332,7 +332,7 @@ index 00000000..72e48e8e + } +} diff --git a/src/main/java/org/bukkit/plugin/EventExecutor.java b/src/main/java/org/bukkit/plugin/EventExecutor.java -index a850f078..9026e108 100644 +index a850f0780..9026e108c 100644 --- a/src/main/java/org/bukkit/plugin/EventExecutor.java +++ b/src/main/java/org/bukkit/plugin/EventExecutor.java @@ -5,9 +5,75 @@ import org.bukkit.event.EventException; @@ -412,7 +412,7 @@ index a850f078..9026e108 100644 + // Paper end } diff --git a/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java b/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java -index 5cc37eee..e72cbde4 100644 +index 5cc37eeed..e72cbde4b 100644 --- a/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java +++ b/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java @@ -300,21 +300,7 @@ public final class JavaPluginLoader implements PluginLoader { @@ -439,5 +439,5 @@ index 5cc37eee..e72cbde4 100644 eventSet.add(new TimedRegisteredListener(listener, executor, eh.priority(), plugin, eh.ignoreCancelled())); } else { -- -2.26.1 +2.26.2 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 b022f63cbf..4ef3c75106 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 da27772114ec79eb988549a347bc9b29c2e5e1da Mon Sep 17 00:00:00 2001 +From edbedec7fd2d9d2b495d81f52c8662429eb2937d 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 @@ -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.25.1 +2.26.2 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 0db5baff39..2e8131b972 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 c0bad2b238c1d7e452039c10b683dc3075376a4c Mon Sep 17 00:00:00 2001 +From 76eaf0d523ba97558aa23fd1b744d9e70c9978d4 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 @@ -42,5 +42,5 @@ index a6ad94ef9..9d4f553c0 100644 while (index != -1) { int start = index; -- -2.25.1 +2.26.2 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 07e64358f0..0a0db70f04 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 f0b316740a9ee295791f79099821d953aa2d11c4 Mon Sep 17 00:00:00 2001 +From 4397b5e0ac84c2dca83409fb9f989bdc4827d687 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 9a5fe8ca4..8ddaf9c2e 100644 + } -- -2.25.1 +2.26.2 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 9cb96bccd9..81b34adfc4 100644 --- a/Spigot-API-Patches/0026-Custom-replacement-for-eaten-items.patch +++ b/Spigot-API-Patches/0026-Custom-replacement-for-eaten-items.patch @@ -1,4 +1,4 @@ -From e9241513c3d597d3dd268f27a6900f94f094c092 Mon Sep 17 00:00:00 2001 +From f628305272a0df52727e9e2db61307dc76cf2762 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 @@ -47,5 +47,5 @@ index c2793f3ef..373f4b5b5 100644 public boolean isCancelled() { return this.isCancelled; -- -2.25.1 +2.26.2 diff --git a/Spigot-API-Patches/0027-Access-items-by-EquipmentSlot.patch b/Spigot-API-Patches/0027-Access-items-by-EquipmentSlot.patch index fd64180406..c3a2245c25 100644 --- a/Spigot-API-Patches/0027-Access-items-by-EquipmentSlot.patch +++ b/Spigot-API-Patches/0027-Access-items-by-EquipmentSlot.patch @@ -1,4 +1,4 @@ -From 05ae91f7ee31917b7918702d1ebbf81b19243d03 Mon Sep 17 00:00:00 2001 +From f83b3e198ebdba89a0ba5c66abf0c46fe2069780 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 @@ -33,5 +33,5 @@ index 88ce9dc6b..96916ec95 100644 + // Paper end } -- -2.25.1 +2.26.2 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 14a9c0b583..d242360a28 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 7a1354a251ad7d78f0a7f56d94d051e30fcc9a9a Mon Sep 17 00:00:00 2001 +From 2c51cf61112a37b8ac0e8d50d54f097b0ad72924 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 @@ -78,5 +78,5 @@ index 000000000..e5dbbd660 + } +} -- -2.25.1 +2.26.2 diff --git a/Spigot-API-Patches/0029-EntityPathfindEvent.patch b/Spigot-API-Patches/0029-EntityPathfindEvent.patch index 8b440200e8..823c22c160 100644 --- a/Spigot-API-Patches/0029-EntityPathfindEvent.patch +++ b/Spigot-API-Patches/0029-EntityPathfindEvent.patch @@ -1,4 +1,4 @@ -From 2ddd503b8812a66fa419df04733b2924fb794a0b Mon Sep 17 00:00:00 2001 +From a8bad8e3690285d16bd45408d20ec035ce9f6aaf Mon Sep 17 00:00:00 2001 From: Aikar Date: Mon, 28 Mar 2016 21:15:34 -0400 Subject: [PATCH] EntityPathfindEvent @@ -94,5 +94,5 @@ index 000000000..63e46b2fb + } +} -- -2.25.1 +2.26.2 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 e1e449a2aa..31c70f03fa 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 dfbeeeb5128994e0561f8b803688603e2e0ea8e3 Mon Sep 17 00:00:00 2001 +From da9edaf6bd9b18c3772b3fda4d338ffbc4453cad 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 baf850226..d363d517c 100644 for (Map values : metadataMap.values()) { if (values.containsKey(owningPlugin)) { -- -2.25.1 +2.26.2 diff --git a/Spigot-API-Patches/0031-Add-MetadataStoreBase.removeAll-Plugin.patch b/Spigot-API-Patches/0031-Add-MetadataStoreBase.removeAll-Plugin.patch index c7e0dd5e04..4d7162d896 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 091dd579f3b4f7cc79e53b67278eb3fb6a1e6230 Mon Sep 17 00:00:00 2001 +From 2b5c599b3684a15bdcd52ec6d182c9f5cef13ca1 Mon Sep 17 00:00:00 2001 From: Aikar Date: Tue, 16 Jul 2013 21:26:50 -0400 Subject: [PATCH] Add MetadataStoreBase.removeAll(Plugin) @@ -45,5 +45,5 @@ index d363d517c..abbe545af 100644 * Creates a unique name for the object receiving metadata by combining * unique data from the subject with a metadataKey. -- -2.25.1 +2.26.2 diff --git a/Spigot-API-Patches/0032-Add-PlayerUseUnknownEntityEvent.patch b/Spigot-API-Patches/0032-Add-PlayerUseUnknownEntityEvent.patch index 0268745f95..da955c3f24 100644 --- a/Spigot-API-Patches/0032-Add-PlayerUseUnknownEntityEvent.patch +++ b/Spigot-API-Patches/0032-Add-PlayerUseUnknownEntityEvent.patch @@ -1,4 +1,4 @@ -From 8ac6eed2974264699f48da9eafb488bc5f9504ab Mon Sep 17 00:00:00 2001 +From d54f8dbd0a40ad129a03b27a1f96d66799559f34 Mon Sep 17 00:00:00 2001 From: Jedediah Smith Date: Sat, 2 Apr 2016 05:08:36 -0400 Subject: [PATCH] Add PlayerUseUnknownEntityEvent @@ -57,5 +57,5 @@ index 000000000..09cfdf48e + } +} -- -2.25.1 +2.26.2 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 81d43b2666..0039380c6f 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 f99266e0f58c1e678b0947bb7f8e043464e83591 Mon Sep 17 00:00:00 2001 +From 219ff12a40896c0bd14c1242dab3518e34a95941 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 @@ -234,5 +234,5 @@ index 000000000..f0bb4e31c + } +} -- -2.25.1 +2.26.2 diff --git a/Spigot-API-Patches/0034-Arrow-pickup-rule-API.patch b/Spigot-API-Patches/0034-Arrow-pickup-rule-API.patch index 849f999435..10910c6280 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 9b6b76c82b9ea8b2ac5a9994b7404972c653eb73 Mon Sep 17 00:00:00 2001 +From bc0b8a53cb6ce795d2ce85037c432db3c464de4a 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 88cebc004..b2bf62a50 100644 + // Paper end } -- -2.25.1 +2.26.2 diff --git a/Spigot-API-Patches/0035-EntityRegainHealthEvent-isFastRegen-API.patch b/Spigot-API-Patches/0035-EntityRegainHealthEvent-isFastRegen-API.patch index b05cfef441..e8bb92018d 100644 --- a/Spigot-API-Patches/0035-EntityRegainHealthEvent-isFastRegen-API.patch +++ b/Spigot-API-Patches/0035-EntityRegainHealthEvent-isFastRegen-API.patch @@ -1,4 +1,4 @@ -From 9ab9b353c9a76455567a474ce06c2916d7789d75 Mon Sep 17 00:00:00 2001 +From 08eb4769f3ce11fe64a2d8863825a28bd9f815cb Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Fri, 22 Apr 2016 01:43:11 -0500 Subject: [PATCH] EntityRegainHealthEvent isFastRegen API @@ -41,5 +41,5 @@ index 8feb6698f..d51d2ec1d 100644 /** * Gets the amount of regained health -- -2.25.1 +2.26.2 diff --git a/Spigot-API-Patches/0036-LootTable-API.patch b/Spigot-API-Patches/0036-LootTable-API.patch index 0503ee7426..81e5b9640d 100644 --- a/Spigot-API-Patches/0036-LootTable-API.patch +++ b/Spigot-API-Patches/0036-LootTable-API.patch @@ -1,4 +1,4 @@ -From f8f1bbee15cabfe54253a4a7e50ee687ebe3694c Mon Sep 17 00:00:00 2001 +From cdc55d7f84c7f4886cf773712bfa3fd73699146d Mon Sep 17 00:00:00 2001 From: Aikar Date: Sun, 1 May 2016 15:19:49 -0400 Subject: [PATCH] LootTable API @@ -401,5 +401,5 @@ index 24a3d989d..901db8524 100644 * Set the seed used when this Loot Table generates loot. * -- -2.25.1 +2.26.2 diff --git a/Spigot-API-Patches/0037-Add-EntityZapEvent.patch b/Spigot-API-Patches/0037-Add-EntityZapEvent.patch index de25fa52bf..3841af2805 100644 --- a/Spigot-API-Patches/0037-Add-EntityZapEvent.patch +++ b/Spigot-API-Patches/0037-Add-EntityZapEvent.patch @@ -1,4 +1,4 @@ -From 3e509ef8019f3efe28e265dbbbdae31c3f23d235 Mon Sep 17 00:00:00 2001 +From 8a1e728b8f151cf52deba5f2b7bee3ac0c2123a2 Mon Sep 17 00:00:00 2001 From: AlphaBlend Date: Sun, 16 Oct 2016 23:19:34 -0700 Subject: [PATCH] Add EntityZapEvent @@ -122,5 +122,5 @@ index 0e0ed93b5..d3949edfc 100644 + // Paper end } -- -2.25.1 +2.26.2 diff --git a/Spigot-API-Patches/0038-Misc-Utils.patch b/Spigot-API-Patches/0038-Misc-Utils.patch index 5cc9da3fe4..8b8a30608e 100644 --- a/Spigot-API-Patches/0038-Misc-Utils.patch +++ b/Spigot-API-Patches/0038-Misc-Utils.patch @@ -1,4 +1,4 @@ -From 559959380fa34db1acd3b167e05bafb17b89e8f4 Mon Sep 17 00:00:00 2001 +From eed23f7813660a542d1e563760e41a1d21e58ed5 Mon Sep 17 00:00:00 2001 From: vemacs Date: Wed, 23 Nov 2016 12:53:43 -0500 Subject: [PATCH] Misc Utils @@ -45,5 +45,5 @@ index 000000000..5bb677ce5 + } +} -- -2.25.1 +2.26.2 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 153132ddbc..514e9a48c4 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 c841a774495970964d668cc65c0715e84f43e951 Mon Sep 17 00:00:00 2001 +From d911fa59c930a36aa9c0ca24f9741fdedfecc6cb 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 @@ -99,5 +99,5 @@ index c62da4131..af8ab73fe 100644 confirmed = true; } else { -- -2.25.1 +2.26.2 diff --git a/Spigot-API-Patches/0040-Add-source-to-PlayerExpChangeEvent.patch b/Spigot-API-Patches/0040-Add-source-to-PlayerExpChangeEvent.patch index befc427447..cc90dc98ac 100644 --- a/Spigot-API-Patches/0040-Add-source-to-PlayerExpChangeEvent.patch +++ b/Spigot-API-Patches/0040-Add-source-to-PlayerExpChangeEvent.patch @@ -1,4 +1,4 @@ -From d021eefa33645c6ad7cb1bf140a9f7602ccc6704 Mon Sep 17 00:00:00 2001 +From 6d38fdc5d943c374318c7d0d3c008d6b21b5ffdb Mon Sep 17 00:00:00 2001 From: AlphaBlend Date: Thu, 8 Sep 2016 08:47:08 -0700 Subject: [PATCH] Add source to PlayerExpChangeEvent @@ -53,5 +53,5 @@ index c99c9281e..7c340f539 100644 * Get the amount of experience the player will receive * -- -2.25.1 +2.26.2 diff --git a/Spigot-API-Patches/0041-Add-ProjectileCollideEvent.patch b/Spigot-API-Patches/0041-Add-ProjectileCollideEvent.patch index efca70a3c4..bce9b888fa 100644 --- a/Spigot-API-Patches/0041-Add-ProjectileCollideEvent.patch +++ b/Spigot-API-Patches/0041-Add-ProjectileCollideEvent.patch @@ -1,4 +1,4 @@ -From 09ab884e22c0b5d6b658c1fb2b9f98b711cd2b7d Mon Sep 17 00:00:00 2001 +From c2bf88392dc9ba74ccce743f0d123b7004a4bd7d Mon Sep 17 00:00:00 2001 From: Techcable Date: Fri, 16 Dec 2016 21:25:39 -0600 Subject: [PATCH] Add ProjectileCollideEvent @@ -78,5 +78,5 @@ index 000000000..453663893 + } +} -- -2.25.1 +2.26.2 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 8607f623e2..497980245c 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 81e518a15896393670d465674c981237f381c4dc Mon Sep 17 00:00:00 2001 +From 282612278f301da5f16d3002c7d0cd7ecd782c3a 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 9e62987cb..6f3ab730b 100644 throw new UnsupportedOperationException("Not supported yet."); } -- -2.25.1 +2.26.2 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 dfa0964305..c8c5127474 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,4 +1,4 @@ -From 16cad21ec53a8899e2579841f235ee51c62052ce Mon Sep 17 00:00:00 2001 +From 0c1b09b9ee6b8ba923f4fd36c8f55d3997ecc931 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 @@ -32,5 +32,5 @@ index beeba55d5..6a854d7cf 100644 + // Paper end } -- -2.25.1 +2.26.2 diff --git a/Spigot-API-Patches/0044-IllegalPacketEvent.patch b/Spigot-API-Patches/0044-IllegalPacketEvent.patch index c4e8612799..725177b9a7 100644 --- a/Spigot-API-Patches/0044-IllegalPacketEvent.patch +++ b/Spigot-API-Patches/0044-IllegalPacketEvent.patch @@ -1,4 +1,4 @@ -From 95814d0fc19ff644b9d7c04a93a16ec96b3c5b6a Mon Sep 17 00:00:00 2001 +From 1069406de4f5ebc7905a30f3bce3af03fb08560c Mon Sep 17 00:00:00 2001 From: Aikar Date: Sun, 4 Dec 2016 01:19:14 -0500 Subject: [PATCH] IllegalPacketEvent @@ -84,5 +84,5 @@ index 000000000..37a17f0bb + } +} -- -2.25.1 +2.26.2 diff --git a/Spigot-API-Patches/0045-Fireworks-API-s.patch b/Spigot-API-Patches/0045-Fireworks-API-s.patch index d0389bcd78..965d4db31c 100644 --- a/Spigot-API-Patches/0045-Fireworks-API-s.patch +++ b/Spigot-API-Patches/0045-Fireworks-API-s.patch @@ -1,4 +1,4 @@ -From 98d25e5120b1967d9983edeb20d952bb16104c87 Mon Sep 17 00:00:00 2001 +From 9189d92918b4203b4ee8a958a6705df801585371 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 f844d5aa9..e8c04c138 100644 + // Paper end } -- -2.25.1 +2.26.2 diff --git a/Spigot-API-Patches/0046-PlayerTeleportEndGatewayEvent.patch b/Spigot-API-Patches/0046-PlayerTeleportEndGatewayEvent.patch index f5e8dfa85e..c99680f507 100644 --- a/Spigot-API-Patches/0046-PlayerTeleportEndGatewayEvent.patch +++ b/Spigot-API-Patches/0046-PlayerTeleportEndGatewayEvent.patch @@ -1,4 +1,4 @@ -From 0e0e72ef0da87fb3a9de37e049181261b1563ade Mon Sep 17 00:00:00 2001 +From 6142445c0581fffa4484fd3ddc164249a3736687 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sat, 31 Dec 2016 20:29:33 -0500 Subject: [PATCH] PlayerTeleportEndGatewayEvent @@ -41,5 +41,5 @@ index 000000000..b64ab6eec + } +} -- -2.25.1 +2.26.2 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 8a0347ca2d..a16231ad94 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 df2cbfd4b45e1d99861b99775717e8bb65521555 Mon Sep 17 00:00:00 2001 +From 06a8a84c8126ecf97e19d1d791193145bef997fe 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 @@ -45,5 +45,5 @@ index cd8a09576..808c3b4a4 100644 * Gets the {@link Block} at the given coordinates * -- -2.25.1 +2.26.2 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 5f77a2ec73..fdf9ed2321 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 a4e43288167984c868f8d3c62aab633fb1f8ae78 Mon Sep 17 00:00:00 2001 +From fa3d1079346548c18f824021facbd8b3be7c1538 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 @@ -121,5 +121,5 @@ index c286edfd8..dec70bbfa 100644 + // Paper end } -- -2.25.1 +2.26.2 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 0116efa0f7..1d6c7e41fd 100644 --- a/Spigot-API-Patches/0049-Expose-WorldBorder-isInBounds-Location-check.patch +++ b/Spigot-API-Patches/0049-Expose-WorldBorder-isInBounds-Location-check.patch @@ -1,4 +1,4 @@ -From 8eb2d55c1b5aa53889b24064e59c13684dc9d0e9 Mon Sep 17 00:00:00 2001 +From 665f136673ecc680de23316c9d1430607813e6ef 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 @@ -28,5 +28,5 @@ index 7e8f5649c..afb7b136b 100644 + // Paper end } -- -2.25.1 +2.26.2 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 7cfc7f7ce7..1fdd6cbdca 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 57dfe41e0fe5f7f191d659a8f17525d507024ec0 Mon Sep 17 00:00:00 2001 +From 990bcb6c18176695797928e6300d34a593334e10 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 @@ -58,5 +58,5 @@ index 7f153000e..1e126487d 100644 } return completions; -- -2.25.1 +2.26.2 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 8b4b87d07b..d689c6e6de 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 5281507980d4dadb00b963312e8f5056f9671d81 Mon Sep 17 00:00:00 2001 +From 3d9d0d5e65508966103b499734e6c63b0a8701d2 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 @@ -192,5 +192,5 @@ index 1b2267f4e..1a58734d9 100644 return to; } -- -2.25.1 +2.26.2 diff --git a/Spigot-API-Patches/0052-Item-canEntityPickup.patch b/Spigot-API-Patches/0052-Item-canEntityPickup.patch index 9fc0e1e68c..3284705429 100644 --- a/Spigot-API-Patches/0052-Item-canEntityPickup.patch +++ b/Spigot-API-Patches/0052-Item-canEntityPickup.patch @@ -1,4 +1,4 @@ -From e577358b94c9b069218f40f2eea0b5156b524549 Mon Sep 17 00:00:00 2001 +From 208a37b615ef0eae1a0c61d55c4de61bac73f5c8 Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Fri, 5 May 2017 03:57:08 -0500 Subject: [PATCH] Item#canEntityPickup @@ -30,5 +30,5 @@ index 00c58c1d9..cb9e9f369 100644 + // Paper end } -- -2.25.1 +2.26.2 diff --git a/Spigot-API-Patches/0053-PlayerPickupItemEvent-setFlyAtPlayer.patch b/Spigot-API-Patches/0053-PlayerPickupItemEvent-setFlyAtPlayer.patch index ba63ef429e..3aa0ee30cf 100644 --- a/Spigot-API-Patches/0053-PlayerPickupItemEvent-setFlyAtPlayer.patch +++ b/Spigot-API-Patches/0053-PlayerPickupItemEvent-setFlyAtPlayer.patch @@ -1,4 +1,4 @@ -From 2f6600df7fdfa7b4d7a3110475814d2c2d72d27f Mon Sep 17 00:00:00 2001 +From 1a7eb89294acf34a67835dfd7c2d62f638c42e19 Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Sun, 7 May 2017 06:26:01 -0500 Subject: [PATCH] PlayerPickupItemEvent#setFlyAtPlayer @@ -53,5 +53,5 @@ index 951ea2cc7..18d82c111 100644 @NotNull -- -2.25.1 +2.26.2 diff --git a/Spigot-API-Patches/0054-PlayerAttemptPickupItemEvent.patch b/Spigot-API-Patches/0054-PlayerAttemptPickupItemEvent.patch index 734c7ff851..2a7daf288f 100644 --- a/Spigot-API-Patches/0054-PlayerAttemptPickupItemEvent.patch +++ b/Spigot-API-Patches/0054-PlayerAttemptPickupItemEvent.patch @@ -1,4 +1,4 @@ -From f5f3d8868eddd5a287febdd2f4ce1d62eac6122e Mon Sep 17 00:00:00 2001 +From 5839439f0beb3bc136e34eb0d9c8358ebe74125f Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Sun, 11 Jun 2017 16:30:37 -0500 Subject: [PATCH] PlayerAttemptPickupItemEvent @@ -100,5 +100,5 @@ index 000000000..fb5cb3dc4 + } +} -- -2.25.1 +2.26.2 diff --git a/Spigot-API-Patches/0055-Add-UnknownCommandEvent.patch b/Spigot-API-Patches/0055-Add-UnknownCommandEvent.patch index 3f5c968abe..5652cca608 100644 --- a/Spigot-API-Patches/0055-Add-UnknownCommandEvent.patch +++ b/Spigot-API-Patches/0055-Add-UnknownCommandEvent.patch @@ -1,4 +1,4 @@ -From c9b7dd5b35264329e3f69140fb8845e44bd1b251 Mon Sep 17 00:00:00 2001 +From d601968fd5d4787245c961ce2abe9eba0803210b Mon Sep 17 00:00:00 2001 From: Sweepyoface Date: Sat, 17 Jun 2017 18:48:06 -0400 Subject: [PATCH] Add UnknownCommandEvent @@ -93,5 +93,5 @@ index 000000000..251342c3c +} + -- -2.25.1 +2.26.2 diff --git a/Spigot-API-Patches/0056-Basic-PlayerProfile-API.patch b/Spigot-API-Patches/0056-Basic-PlayerProfile-API.patch index 72603eaf8f..07fdb85146 100644 --- a/Spigot-API-Patches/0056-Basic-PlayerProfile-API.patch +++ b/Spigot-API-Patches/0056-Basic-PlayerProfile-API.patch @@ -1,4 +1,4 @@ -From ce40c2ae5ef2185bbe92984163dd404087d6141d Mon Sep 17 00:00:00 2001 +From 64a0d3e11488bbbc2ed7c6ee90d664af630bec8d Mon Sep 17 00:00:00 2001 From: Aikar Date: Mon, 15 Jan 2018 21:46:46 -0500 Subject: [PATCH] Basic PlayerProfile API @@ -318,5 +318,5 @@ index 112098f9b..6778ac8e5 100644 // Paper end } -- -2.25.1 +2.26.2 diff --git a/Spigot-API-Patches/0057-Shoulder-Entities-Release-API.patch b/Spigot-API-Patches/0057-Shoulder-Entities-Release-API.patch index 9a98448e82..60a9c6aa09 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 22a941921b2b5577054bbc53d0d21adb7dba5877 Mon Sep 17 00:00:00 2001 +From cd54dbd0385dc40f13519fcb7dda7d103dd0d6ee 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 a7f08bb1..3adff676 100644 +index a7f08bb1c..3adff676c 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 diff --git a/Spigot-API-Patches/0058-Profile-Lookup-Events.patch b/Spigot-API-Patches/0058-Profile-Lookup-Events.patch index 53e9c6f779..2d31a37f4d 100644 --- a/Spigot-API-Patches/0058-Profile-Lookup-Events.patch +++ b/Spigot-API-Patches/0058-Profile-Lookup-Events.patch @@ -1,4 +1,4 @@ -From ee60b16c81cd7ad8564d94a908c93eae2263973e Mon Sep 17 00:00:00 2001 +From 4b6c042da9e923edd76bc5fdc607ed401d4ced08 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sat, 17 Jun 2017 16:30:44 -0400 Subject: [PATCH] Profile Lookup Events @@ -173,5 +173,5 @@ index 000000000..4dcf6242c + +} -- -2.25.1 +2.26.2 diff --git a/Spigot-API-Patches/0059-Entity-fromMobSpawner.patch b/Spigot-API-Patches/0059-Entity-fromMobSpawner.patch index d120b73524..b04ea686da 100644 --- a/Spigot-API-Patches/0059-Entity-fromMobSpawner.patch +++ b/Spigot-API-Patches/0059-Entity-fromMobSpawner.patch @@ -1,4 +1,4 @@ -From cf40a09c3aafc120d4653b62ade05c18cf6574f6 Mon Sep 17 00:00:00 2001 +From f4dcdb8703168366918c79b871d00e942add7170 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 4e4445d18..e2952209d 100644 // Paper end } -- -2.25.1 +2.26.2 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 d8f712eebd..8a6de80997 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 550cd3e16b4c171704291fe55100ff9e3cdba55e Mon Sep 17 00:00:00 2001 +From 869f1fac4b79043563dfa4625acdbabc613f7b9b 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 @@ -82,5 +82,5 @@ index 000000000..7944f26a3 + +public interface SaddledHorseInventory extends AbstractHorseInventory {} -- -2.25.1 +2.26.2 diff --git a/Spigot-API-Patches/0061-ensureServerConversions-API.patch b/Spigot-API-Patches/0061-ensureServerConversions-API.patch index 2319955e7e..e9be7570c5 100644 --- a/Spigot-API-Patches/0061-ensureServerConversions-API.patch +++ b/Spigot-API-Patches/0061-ensureServerConversions-API.patch @@ -1,4 +1,4 @@ -From ea049a06b4c2090fbf19ac3bf86bf2bc4662f49e Mon Sep 17 00:00:00 2001 +From 0a9552614a67b3e8a3b3ef7b58933043fc799766 Mon Sep 17 00:00:00 2001 From: Aikar Date: Wed, 4 May 2016 23:55:48 -0400 Subject: [PATCH] ensureServerConversions API @@ -62,5 +62,5 @@ index f70a6a22b..07aa65d1a 100644 + // Paper end } -- -2.25.1 +2.26.2 diff --git a/Spigot-API-Patches/0062-Add-getI18NDisplayName-API.patch b/Spigot-API-Patches/0062-Add-getI18NDisplayName-API.patch index d1f9ede075..38a24c4ad2 100644 --- a/Spigot-API-Patches/0062-Add-getI18NDisplayName-API.patch +++ b/Spigot-API-Patches/0062-Add-getI18NDisplayName-API.patch @@ -1,4 +1,4 @@ -From 50e776a94f7520476e8899ecd8573b261c0fc06e Mon Sep 17 00:00:00 2001 +From b62a22ca13ce778145dbc34dcdffe4813bc30c24 Mon Sep 17 00:00:00 2001 From: Aikar Date: Wed, 4 May 2016 23:55:48 -0400 Subject: [PATCH] Add getI18NDisplayName API @@ -51,5 +51,5 @@ index 07aa65d1a..e9ba31152 100644 // Paper end } -- -2.25.1 +2.26.2 diff --git a/Spigot-API-Patches/0063-ProfileWhitelistVerifyEvent.patch b/Spigot-API-Patches/0063-ProfileWhitelistVerifyEvent.patch index 7ed5ce1f13..af024ee16f 100644 --- a/Spigot-API-Patches/0063-ProfileWhitelistVerifyEvent.patch +++ b/Spigot-API-Patches/0063-ProfileWhitelistVerifyEvent.patch @@ -1,4 +1,4 @@ -From 60fe06db929a635f93e050456fa5e2e0800592c2 Mon Sep 17 00:00:00 2001 +From 92673cadf67817aab73990289c74c27127703771 Mon Sep 17 00:00:00 2001 From: Aikar Date: Mon, 3 Jul 2017 18:11:34 -0500 Subject: [PATCH] ProfileWhitelistVerifyEvent @@ -131,5 +131,5 @@ index 000000000..b10176289 + } +} -- -2.25.1 +2.26.2 diff --git a/Spigot-API-Patches/0064-Make-plugins-list-alphabetical.patch b/Spigot-API-Patches/0064-Make-plugins-list-alphabetical.patch index d0ec4fbc97..db60a6e1f8 100644 --- a/Spigot-API-Patches/0064-Make-plugins-list-alphabetical.patch +++ b/Spigot-API-Patches/0064-Make-plugins-list-alphabetical.patch @@ -1,4 +1,4 @@ -From 2f10a17ee8ab17bebd10793c17d178d6800a973e Mon Sep 17 00:00:00 2001 +From 45ec6aaac291417a79ebfad70ffb2c02b538914f Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Mon, 31 Jul 2017 02:08:55 -0500 Subject: [PATCH] Make /plugins list alphabetical @@ -58,5 +58,5 @@ index bcb576a42..a1071e317 100644 } } -- -2.25.1 +2.26.2 diff --git a/Spigot-API-Patches/0065-LivingEntity-setKiller.patch b/Spigot-API-Patches/0065-LivingEntity-setKiller.patch index 512f869a0d..4ca7b9bfa4 100644 --- a/Spigot-API-Patches/0065-LivingEntity-setKiller.patch +++ b/Spigot-API-Patches/0065-LivingEntity-setKiller.patch @@ -1,4 +1,4 @@ -From 238ffac36922679c18effa5dc57ec213734e14a5 Mon Sep 17 00:00:00 2001 +From 203d058aa3ed3a1b4217f821bc7c2ee6f6b266e2 Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Mon, 31 Jul 2017 01:49:43 -0500 Subject: [PATCH] LivingEntity#setKiller @@ -25,5 +25,5 @@ index 52541e496..ae712e76d 100644 * Adds the given {@link PotionEffect} to the living entity. * -- -2.25.1 +2.26.2 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 923770a3e9..5aff82faa3 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 34676ba4f3ae9ae7934cf80a78b2230f43d24941 Mon Sep 17 00:00:00 2001 +From e51e0cbb38eebff56b8323f32a2d23b9207e3599 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 @@ -40,5 +40,5 @@ index 223190054..bb2e55e97 100644 /** -- -2.25.1 +2.26.2 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 08b2010357..8fd49e9ad6 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 ffef7f82e6a112395460bed64907a045656d685a Mon Sep 17 00:00:00 2001 +From 6d58aa991616435bb4a469b890c068c73d1c0aa4 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 3712b70bc..2cb971408 100644 +index 661d109f7..20c473f52 100644 --- a/pom.xml +++ b/pom.xml @@ -109,6 +109,13 @@ @@ -50,5 +50,5 @@ index febfec6ef..79890c68f 100644 * Returns the name of the plugin. *

-- -2.25.1 +2.26.2 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 8d8d5a9135..6cbb016a23 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 470028a790e67685c105a18098263915ec876864 Mon Sep 17 00:00:00 2001 +From a2d273ffe8bf9ad5b9526c51085a868a9d1099ab 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 36f542a85..3a02dbe9d 100644 } } -- -2.25.1 +2.26.2 diff --git a/Spigot-API-Patches/0069-Add-PlayerJumpEvent.patch b/Spigot-API-Patches/0069-Add-PlayerJumpEvent.patch index 424b4acd00..73286d00b5 100644 --- a/Spigot-API-Patches/0069-Add-PlayerJumpEvent.patch +++ b/Spigot-API-Patches/0069-Add-PlayerJumpEvent.patch @@ -1,4 +1,4 @@ -From c4ca332d0ca8e7faf24ebde6d024bfd7af31c49c Mon Sep 17 00:00:00 2001 +From 0d1a83fae7d8aa0b04d3fcf518df34570be93c7b Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Thu, 28 Sep 2017 17:21:32 -0400 Subject: [PATCH] Add PlayerJumpEvent @@ -117,5 +117,5 @@ index 000000000..289a0d784 + } +} -- -2.25.1 +2.26.2 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 a3afc77359..78c2535f00 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 0f31dba70d86efcce28be143cd14b9263b250295 Mon Sep 17 00:00:00 2001 +From 133d45c9d35af37863373b0786ab52a73c1940cb 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 @@ -70,5 +70,5 @@ index cb7d9f055..9398f303f 100644 /** * Gets the "friendly" name to display of this player. This may include -- -2.25.1 +2.26.2 diff --git a/Spigot-API-Patches/0071-Add-PlayerArmorChangeEvent.patch b/Spigot-API-Patches/0071-Add-PlayerArmorChangeEvent.patch index ba0f983083..b6956ed4b6 100644 --- a/Spigot-API-Patches/0071-Add-PlayerArmorChangeEvent.patch +++ b/Spigot-API-Patches/0071-Add-PlayerArmorChangeEvent.patch @@ -1,4 +1,4 @@ -From 3c8d83a02f90cdcadab5ab2b4caa858424ae992f Mon Sep 17 00:00:00 2001 +From 23bde144450fd0412187276dbb2a6d6264f4216b Mon Sep 17 00:00:00 2001 From: pkt77 Date: Fri, 10 Nov 2017 23:45:59 -0500 Subject: [PATCH] Add PlayerArmorChangeEvent @@ -148,5 +148,5 @@ index 000000000..2827a1002 + } +} -- -2.25.1 +2.26.2 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 44324d1c5f..84bcaaafec 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 ece58ef4c7915ca83cad87704414c54bf251d3eb Mon Sep 17 00:00:00 2001 +From b6e9fd15bac76fd7f37336a860f8139f33491a43 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 @@ -30,5 +30,5 @@ index 8a48572e9..8154093df 100644 * Returns the biome that this block resides in * -- -2.25.1 +2.26.2 diff --git a/Spigot-API-Patches/0073-AsyncTabCompleteEvent.patch b/Spigot-API-Patches/0073-AsyncTabCompleteEvent.patch index f03bf26c09..9bb0550eb7 100644 --- a/Spigot-API-Patches/0073-AsyncTabCompleteEvent.patch +++ b/Spigot-API-Patches/0073-AsyncTabCompleteEvent.patch @@ -1,4 +1,4 @@ -From fadca523e626b46d425dc49ec7a52379c7ab963d Mon Sep 17 00:00:00 2001 +From 52a46f26ad9a823843ef700a61b2c8f0eced2505 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sun, 26 Nov 2017 13:17:09 -0500 Subject: [PATCH] AsyncTabCompleteEvent @@ -265,5 +265,5 @@ index d1a9956a1..f96c4ba53 100644 @Override -- -2.25.1 +2.26.2 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 893a466fa4..f9428f93bf 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 a05418027d1bbb6f2adaeef7fa06c19b2f9ca0fd Mon Sep 17 00:00:00 2001 +From e04e67172c3c5ae3b4ce5fe1a899ae0f5c538f2a 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 @@ -34,5 +34,5 @@ index 68447fb8c..84062dd71 100644 } -- -2.25.1 +2.26.2 diff --git a/Spigot-API-Patches/0075-PlayerPickupExperienceEvent.patch b/Spigot-API-Patches/0075-PlayerPickupExperienceEvent.patch index 076b9a64c6..9770e8292e 100644 --- a/Spigot-API-Patches/0075-PlayerPickupExperienceEvent.patch +++ b/Spigot-API-Patches/0075-PlayerPickupExperienceEvent.patch @@ -1,4 +1,4 @@ -From 71071c945004982e39bd9f02ca5dd1183b1f37e0 Mon Sep 17 00:00:00 2001 +From 88833a36b967c46876edcd7c827f69d107b0441e Mon Sep 17 00:00:00 2001 From: Aikar Date: Tue, 19 Dec 2017 22:00:41 -0500 Subject: [PATCH] PlayerPickupExperienceEvent @@ -92,5 +92,5 @@ index 000000000..f7beb22d5 + } +} -- -2.25.1 +2.26.2 diff --git a/Spigot-API-Patches/0076-ExperienceOrbMergeEvent.patch b/Spigot-API-Patches/0076-ExperienceOrbMergeEvent.patch index db6a584644..0b5fe58ca6 100644 --- a/Spigot-API-Patches/0076-ExperienceOrbMergeEvent.patch +++ b/Spigot-API-Patches/0076-ExperienceOrbMergeEvent.patch @@ -1,4 +1,4 @@ -From 8ff1280282b3c67e3fb94958a9a9c4f4d6410faa Mon Sep 17 00:00:00 2001 +From 6aa6f1d8373362d2388f8fd7268c9c69f579ee49 Mon Sep 17 00:00:00 2001 From: Aikar Date: Tue, 19 Dec 2017 22:56:24 -0500 Subject: [PATCH] ExperienceOrbMergeEvent @@ -101,5 +101,5 @@ index 000000000..0ce3e3977 + } +} -- -2.25.1 +2.26.2 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 fa705f70ec..cd355c8f0d 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 e52b092a351ea904e30208c752ac95425296416c Mon Sep 17 00:00:00 2001 +From 79cdeb87be87e51812ecf9302e19d1e247492a34 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 @@ -49,5 +49,5 @@ index 9398f303f..8a67375de 100644 /** * Gives the player the amount of experience levels specified. Levels can -- -2.25.1 +2.26.2 diff --git a/Spigot-API-Patches/0078-PreCreatureSpawnEvent.patch b/Spigot-API-Patches/0078-PreCreatureSpawnEvent.patch index 6472e50793..3d9eb02267 100644 --- a/Spigot-API-Patches/0078-PreCreatureSpawnEvent.patch +++ b/Spigot-API-Patches/0078-PreCreatureSpawnEvent.patch @@ -1,4 +1,4 @@ -From 51c2512ba9f95dbfd65b88b9fe21d56bde914c32 Mon Sep 17 00:00:00 2001 +From b70880b6efa57cdc1bc10a32ff65d2bd8d2a9294 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sun, 14 Jan 2018 16:59:43 -0500 Subject: [PATCH] PreCreatureSpawnEvent @@ -125,5 +125,5 @@ index 000000000..d5edde9cd + } +} -- -2.25.1 +2.26.2 diff --git a/Spigot-API-Patches/0079-PlayerNaturallySpawnCreaturesEvent.patch b/Spigot-API-Patches/0079-PlayerNaturallySpawnCreaturesEvent.patch index 7373f2b591..d2bc4767d7 100644 --- a/Spigot-API-Patches/0079-PlayerNaturallySpawnCreaturesEvent.patch +++ b/Spigot-API-Patches/0079-PlayerNaturallySpawnCreaturesEvent.patch @@ -1,4 +1,4 @@ -From a33bd8275812e8768a043bc3f267fbf8ac6db744 Mon Sep 17 00:00:00 2001 +From 4a8edbf79556ad5f288957d8876a9cdb60fb3693 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sun, 14 Jan 2018 17:31:37 -0500 Subject: [PATCH] PlayerNaturallySpawnCreaturesEvent @@ -79,5 +79,5 @@ index 000000000..112a0dbf5 + } +} -- -2.25.1 +2.26.2 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 22b996ead4..5758ed7924 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 9a1ede056ec1aba4f009706f545751ab7a6d40d5 Mon Sep 17 00:00:00 2001 +From 9e8767f0b3b3f8515a1613e9a9bb9618ea430d25 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 @@ -77,5 +77,5 @@ index 35a392033..8b2465ea2 100644 * Gets the owner of the skull. * -- -2.25.1 +2.26.2 diff --git a/Spigot-API-Patches/0081-Fill-Profile-Property-Events.patch b/Spigot-API-Patches/0081-Fill-Profile-Property-Events.patch index 420573e4d4..32a0f92c95 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 a9c4c45122619d2ce3561c256614f4c81b893309 Mon Sep 17 00:00:00 2001 +From 9389a54198096a32e5e1ff73b5a0d6effd4eec27 Mon Sep 17 00:00:00 2001 From: Aikar Date: Tue, 2 Jan 2018 00:31:08 -0500 Subject: [PATCH] Fill Profile Property Events @@ -175,5 +175,5 @@ index 000000000..021bc8631 + } +} -- -2.25.1 +2.26.2 diff --git a/Spigot-API-Patches/0082-PlayerAdvancementCriterionGrantEvent.patch b/Spigot-API-Patches/0082-PlayerAdvancementCriterionGrantEvent.patch index acce16a853..d5a4dc0a29 100644 --- a/Spigot-API-Patches/0082-PlayerAdvancementCriterionGrantEvent.patch +++ b/Spigot-API-Patches/0082-PlayerAdvancementCriterionGrantEvent.patch @@ -1,4 +1,4 @@ -From 16e6184f6baaa78ed043b38ab35a19ddbd296c21 Mon Sep 17 00:00:00 2001 +From 34cad9effb5ade48de65055b9afa0eb5aae8848c Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Fri, 19 Jan 2018 08:15:14 -0600 Subject: [PATCH] PlayerAdvancementCriterionGrantEvent @@ -74,5 +74,5 @@ index 000000000..bb8d7c959 + } +} -- -2.25.1 +2.26.2 diff --git a/Spigot-API-Patches/0083-Add-ArmorStand-Item-Meta.patch b/Spigot-API-Patches/0083-Add-ArmorStand-Item-Meta.patch index cec7226e50..e4c345ff42 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 a5fc188f4ae9a73cf2c391bbf684aba1220eb83d Mon Sep 17 00:00:00 2001 +From ab0241468203214f22dbaf2b94d3a2f9a4b3ee30 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 @@ -95,5 +95,5 @@ index 000000000..7e4acfff1 + void setMarker(boolean marker); +} -- -2.25.1 +2.26.2 diff --git a/Spigot-API-Patches/0084-Optimize-Hoppers.patch b/Spigot-API-Patches/0084-Optimize-Hoppers.patch index baef2fc24f..bec2f7c73a 100644 --- a/Spigot-API-Patches/0084-Optimize-Hoppers.patch +++ b/Spigot-API-Patches/0084-Optimize-Hoppers.patch @@ -1,4 +1,4 @@ -From 6851eb5619af4d2f79884831812a779117402e7c Mon Sep 17 00:00:00 2001 +From d697214b9114e19f04b5c2169f5d284da5675335 Mon Sep 17 00:00:00 2001 From: Aikar Date: Thu, 18 Jan 2018 01:00:27 -0500 Subject: [PATCH] Optimize Hoppers @@ -38,5 +38,5 @@ index a8c48f5a4..04d4a83bf 100644 } -- -2.25.1 +2.26.2 diff --git a/Spigot-API-Patches/0085-Tameable-getOwnerUniqueId-API.patch b/Spigot-API-Patches/0085-Tameable-getOwnerUniqueId-API.patch index 650598ff02..1d9d5bb2df 100644 --- a/Spigot-API-Patches/0085-Tameable-getOwnerUniqueId-API.patch +++ b/Spigot-API-Patches/0085-Tameable-getOwnerUniqueId-API.patch @@ -1,4 +1,4 @@ -From 6ee338de00379380b81ef00c5af09fa30dd640ae Mon Sep 17 00:00:00 2001 +From 0a6d202f31be5d5d2ecc88702363b5a6b662afd4 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sat, 24 Feb 2018 00:55:52 -0500 Subject: [PATCH] Tameable#getOwnerUniqueId API @@ -41,5 +41,5 @@ index 0c066bdfc..957a60167 100644 */ @Nullable -- -2.25.1 +2.26.2 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 8a276fecf6..5dc206a7f7 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 716f586dbbbef1b30c684d64ed58a19397aa6b70 Mon Sep 17 00:00:00 2001 +From 713ad4df4e42006bb8e1fa624a12aefab732091a 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 @@ -53,5 +53,5 @@ index c8384da69..6c09ea6c6 100644 this.message = ""; this.name = name; -- -2.25.1 +2.26.2 diff --git a/Spigot-API-Patches/0087-Add-extended-PaperServerListPingEvent.patch b/Spigot-API-Patches/0087-Add-extended-PaperServerListPingEvent.patch index 9a14aaeb8f..dfbd4416c7 100644 --- a/Spigot-API-Patches/0087-Add-extended-PaperServerListPingEvent.patch +++ b/Spigot-API-Patches/0087-Add-extended-PaperServerListPingEvent.patch @@ -1,4 +1,4 @@ -From 2ac81c41e0800c8bfe372eea825fbdcebfe7ed62 Mon Sep 17 00:00:00 2001 +From 1f72e6ba6fe22b8a0d93ce86effc67d43320e59f Mon Sep 17 00:00:00 2001 From: Minecrell Date: Wed, 11 Oct 2017 15:55:38 +0200 Subject: [PATCH] Add extended PaperServerListPingEvent @@ -369,5 +369,5 @@ index 612958a33..bb4f7702c 100644 + // Paper end } -- -2.25.1 +2.26.2 diff --git a/Spigot-API-Patches/0088-Player.setPlayerProfile-API.patch b/Spigot-API-Patches/0088-Player.setPlayerProfile-API.patch index 247378b7b5..6df4fb6178 100644 --- a/Spigot-API-Patches/0088-Player.setPlayerProfile-API.patch +++ b/Spigot-API-Patches/0088-Player.setPlayerProfile-API.patch @@ -1,4 +1,4 @@ -From bde1364a51f6d9157b5f561df604031e8f830cf5 Mon Sep 17 00:00:00 2001 +From e790f4bf31e991ec4696ceb8f2b1dc87bedcd903 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 8a67375de..8fe402336 100644 // Spigot start -- -2.25.1 +2.26.2 diff --git a/Spigot-API-Patches/0089-getPlayerUniqueId-API.patch b/Spigot-API-Patches/0089-getPlayerUniqueId-API.patch index d22547010d..6104598d39 100644 --- a/Spigot-API-Patches/0089-getPlayerUniqueId-API.patch +++ b/Spigot-API-Patches/0089-getPlayerUniqueId-API.patch @@ -1,4 +1,4 @@ -From 3af92ccbed37aa47009dc73c9e40f7d6db1e2255 Mon Sep 17 00:00:00 2001 +From 3a9376909cd6ad2cd30d5f777cddb24a07d2c087 Mon Sep 17 00:00:00 2001 From: Aikar Date: Thu, 22 Mar 2018 01:39:28 -0400 Subject: [PATCH] getPlayerUniqueId API @@ -57,5 +57,5 @@ index 6778ac8e5..11fffc514 100644 * Gets the plugin manager for interfacing with plugins. * -- -2.25.1 +2.26.2 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 faca7dd1f7..c5c2fd690e 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 046c71d911ea7b1bdcd6f35fb3d5fa7f77d63384 Mon Sep 17 00:00:00 2001 +From 22c3773a195302a193b2c3d53ca7336ad4a64b4f 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 @@ -29,5 +29,5 @@ index 517d15238..ffda9f6a8 100644 + } -- -2.25.1 +2.26.2 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 fb372b374e..abda197adb 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 1a4b026170e3aca5fdeacbc8c2cd499e0cd339dd Mon Sep 17 00:00:00 2001 +From ff1c8019060044851d060eb90f467f1b68506715 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 3adff676..2d413d72 100644 +index 3adff676c..2d413d720 100644 --- a/src/main/java/org/bukkit/entity/HumanEntity.java +++ b/src/main/java/org/bukkit/entity/HumanEntity.java @@ -468,4 +468,13 @@ public interface HumanEntity extends LivingEntity, AnimalTamer, InventoryHolder 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 a6dcd8c5fc..03675449cc 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 eb23471f37a4e9f29ac12f2d92aa64fd30dfa758 Mon Sep 17 00:00:00 2001 +From 2b909f379fdaf8b917ef577b5cf68a1960dd1b80 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 @@ -252,5 +252,5 @@ index 8fe402336..c37d7fca0 100644 /** * Sends an Action Bar message to the client. -- -2.25.1 +2.26.2 diff --git a/Spigot-API-Patches/0093-EndermanEscapeEvent.patch b/Spigot-API-Patches/0093-EndermanEscapeEvent.patch index 63520a7135..feb44170e9 100644 --- a/Spigot-API-Patches/0093-EndermanEscapeEvent.patch +++ b/Spigot-API-Patches/0093-EndermanEscapeEvent.patch @@ -1,4 +1,4 @@ -From adcdedec7cd6db5eac2e0e059634490079f30d06 Mon Sep 17 00:00:00 2001 +From de038a5328912aae8d9a936569c84dec095289ca Mon Sep 17 00:00:00 2001 From: Aikar Date: Mon, 30 Apr 2018 13:14:30 -0400 Subject: [PATCH] EndermanEscapeEvent @@ -101,5 +101,5 @@ index 000000000..806112a8b + } +} -- -2.25.1 +2.26.2 diff --git a/Spigot-API-Patches/0094-Enderman.teleportRandomly.patch b/Spigot-API-Patches/0094-Enderman.teleportRandomly.patch index 0cfc0166a7..9d6d79ff22 100644 --- a/Spigot-API-Patches/0094-Enderman.teleportRandomly.patch +++ b/Spigot-API-Patches/0094-Enderman.teleportRandomly.patch @@ -1,4 +1,4 @@ -From 370964285ffa5b68ca08697985f394d4c91b6c79 Mon Sep 17 00:00:00 2001 +From 773bba9d4c6528f8878b14ab85f3f4db73ece4ad Mon Sep 17 00:00:00 2001 From: Aikar Date: Mon, 30 Apr 2018 13:29:15 -0400 Subject: [PATCH] Enderman.teleportRandomly() @@ -28,5 +28,5 @@ index bb325d9c8..821c690f8 100644 * Gets the id and data of the block that the Enderman is carrying. * -- -2.25.1 +2.26.2 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 bf3c88196c..344383ab76 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 57cf333277477c1a6f7ac9b5fcf035b530841765 Mon Sep 17 00:00:00 2001 +From 42a081572a8efbe94ed5f53b9f4f28dd92c9a775 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 @@ -291,5 +291,5 @@ index 6c09ea6c6..76c4a1a6e 100644 */ public void setPlayerProfile(@NotNull PlayerProfile profile) { -- -2.25.1 +2.26.2 diff --git a/Spigot-API-Patches/0096-Location.isChunkLoaded-API.patch b/Spigot-API-Patches/0096-Location.isChunkLoaded-API.patch index f4cf7a5a45..f3e03b7999 100644 --- a/Spigot-API-Patches/0096-Location.isChunkLoaded-API.patch +++ b/Spigot-API-Patches/0096-Location.isChunkLoaded-API.patch @@ -1,4 +1,4 @@ -From 6f24ef7d7b7146b9d2c032252b7866657b31c3a1 Mon Sep 17 00:00:00 2001 +From 350b09c26418358e4b30679f7c35467491fc1dc3 Mon Sep 17 00:00:00 2001 From: Aikar Date: Mon, 30 Apr 2018 19:27:31 -0400 Subject: [PATCH] Location.isChunkLoaded() API @@ -17,5 +17,5 @@ index 0939a8070..6c8b8eddc 100644 public boolean equals(Object obj) { if (obj == null) { -- -2.25.1 +2.26.2 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 cbb8dbe57c..9167860d27 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 77befc8808bf1a216fdae6060f9a19d5f0b36df0 Mon Sep 17 00:00:00 2001 +From 336ac304c375b8aa1bc686c7594b2b4a39725d30 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 @@ -578,5 +578,5 @@ index fbe7e76c0..085c7a42c 100644 /** * Spawns the particle (the number of times specified by count) -- -2.25.1 +2.26.2 diff --git a/Spigot-API-Patches/0098-EndermanAttackPlayerEvent.patch b/Spigot-API-Patches/0098-EndermanAttackPlayerEvent.patch index 4ec2c5f98e..3afc53c8d5 100644 --- a/Spigot-API-Patches/0098-EndermanAttackPlayerEvent.patch +++ b/Spigot-API-Patches/0098-EndermanAttackPlayerEvent.patch @@ -1,4 +1,4 @@ -From d3004d7b163f83fe6e98647f03cdfe3a90d388ae Mon Sep 17 00:00:00 2001 +From 3659aee2bdce6ddba260678e1cbd700fc9b11820 Mon Sep 17 00:00:00 2001 From: Aikar Date: Tue, 1 May 2018 20:17:44 -0400 Subject: [PATCH] EndermanAttackPlayerEvent @@ -115,5 +115,5 @@ index 000000000..f530a3d93 + } +} -- -2.25.1 +2.26.2 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 55a1aaad59..b31b181ea0 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 69e017b9ea1d488c8d73dc1d2cbb55bab33dc917 Mon Sep 17 00:00:00 2001 +From 26a891ffd609b62b8198ff3cfabca35afacf84bb 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 e72cbde4b..32ec68b48 100644 } } -- -2.25.1 +2.26.2 diff --git a/Spigot-API-Patches/0100-WitchConsumePotionEvent.patch b/Spigot-API-Patches/0100-WitchConsumePotionEvent.patch index 5f0d332c46..b5a6bacaf1 100644 --- a/Spigot-API-Patches/0100-WitchConsumePotionEvent.patch +++ b/Spigot-API-Patches/0100-WitchConsumePotionEvent.patch @@ -1,4 +1,4 @@ -From 15909a0d10135b8cfa2062fb3df50d2277a10528 Mon Sep 17 00:00:00 2001 +From 630e23c654223c31b4307999dd467b9ede7f501f Mon Sep 17 00:00:00 2001 From: Aikar Date: Wed, 16 May 2018 20:26:16 -0400 Subject: [PATCH] WitchConsumePotionEvent @@ -121,5 +121,5 @@ index 000000000..6ef6367b6 + } +} -- -2.25.1 +2.26.2 diff --git a/Spigot-API-Patches/0101-WitchThrowPotionEvent.patch b/Spigot-API-Patches/0101-WitchThrowPotionEvent.patch index 029a15a561..65985c43fc 100644 --- a/Spigot-API-Patches/0101-WitchThrowPotionEvent.patch +++ b/Spigot-API-Patches/0101-WitchThrowPotionEvent.patch @@ -1,4 +1,4 @@ -From 3ebe597d0a39e9955c99a30520c05cb986f8b7a2 Mon Sep 17 00:00:00 2001 +From 8688ccbce452752649c1f63de69d95374523626d Mon Sep 17 00:00:00 2001 From: Aikar Date: Wed, 16 May 2018 20:39:09 -0400 Subject: [PATCH] WitchThrowPotionEvent @@ -92,5 +92,5 @@ index 6ef6367b6..688a596aa 100644 @Override -- -2.25.1 +2.26.2 diff --git a/Spigot-API-Patches/0102-Location.toBlockLocation-toCenterLocation.patch b/Spigot-API-Patches/0102-Location.toBlockLocation-toCenterLocation.patch index 21e7d71eda..a5edfae217 100644 --- a/Spigot-API-Patches/0102-Location.toBlockLocation-toCenterLocation.patch +++ b/Spigot-API-Patches/0102-Location.toBlockLocation-toCenterLocation.patch @@ -1,4 +1,4 @@ -From d1e4f01c2240314cf9fb94f6a4175a7b61bd4626 Mon Sep 17 00:00:00 2001 +From 923c4bb418105067ca2ce1394153b2ff530cafcf Mon Sep 17 00:00:00 2001 From: Aikar Date: Thu, 24 May 2018 21:01:13 -0400 Subject: [PATCH] Location.toBlockLocation/toCenterLocation() @@ -42,5 +42,5 @@ index 6c8b8eddc..f61bf28af 100644 public boolean equals(Object obj) { if (obj == null) { -- -2.25.1 +2.26.2 diff --git a/Spigot-API-Patches/0103-PotionEffect-clone-methods.patch b/Spigot-API-Patches/0103-PotionEffect-clone-methods.patch index 1b1878a8c4..7106a63821 100644 --- a/Spigot-API-Patches/0103-PotionEffect-clone-methods.patch +++ b/Spigot-API-Patches/0103-PotionEffect-clone-methods.patch @@ -1,4 +1,4 @@ -From f5469866079fc18d5344de56358dcb363ba3d1c0 Mon Sep 17 00:00:00 2001 +From a73327760b67e2aacef48ba2cb03137e1ef14ded Mon Sep 17 00:00:00 2001 From: Aikar Date: Sun, 3 Jun 2018 04:10:13 -0400 Subject: [PATCH] PotionEffect clone methods @@ -43,5 +43,5 @@ index 60716c627..747677511 100644 private static PotionEffectType getEffectType(@NotNull Map map) { int type = getInt(map, TYPE); -- -2.25.1 +2.26.2 diff --git a/Spigot-API-Patches/0104-WitchReadyPotionEvent.patch b/Spigot-API-Patches/0104-WitchReadyPotionEvent.patch index 51b19a885c..402f24a729 100644 --- a/Spigot-API-Patches/0104-WitchReadyPotionEvent.patch +++ b/Spigot-API-Patches/0104-WitchReadyPotionEvent.patch @@ -1,4 +1,4 @@ -From 025707f03023e41f1c0d8e49273c01635edff01d Mon Sep 17 00:00:00 2001 +From 8c8906518963b84b507c5c2137db31a7b687de9f Mon Sep 17 00:00:00 2001 From: Aikar Date: Tue, 5 Jun 2018 22:47:08 -0400 Subject: [PATCH] WitchReadyPotionEvent @@ -92,5 +92,5 @@ index 000000000..5351b523d + } +} -- -2.25.1 +2.26.2 diff --git a/Spigot-API-Patches/0105-ItemStack-getMaxItemUseDuration.patch b/Spigot-API-Patches/0105-ItemStack-getMaxItemUseDuration.patch index d181fccc13..eb838f98ad 100644 --- a/Spigot-API-Patches/0105-ItemStack-getMaxItemUseDuration.patch +++ b/Spigot-API-Patches/0105-ItemStack-getMaxItemUseDuration.patch @@ -1,4 +1,4 @@ -From e3c1726bb11a89b2540c1c26f1282ef9d057ef73 Mon Sep 17 00:00:00 2001 +From 67bbdc3978562a2bde35e338a9f0610e7a172898 Mon Sep 17 00:00:00 2001 From: Aikar Date: Tue, 5 Jun 2018 22:59:50 -0400 Subject: [PATCH] ItemStack#getMaxItemUseDuration @@ -24,5 +24,5 @@ index e9ba31152..125b74dd8 100644 // Paper end } -- -2.25.1 +2.26.2 diff --git a/Spigot-API-Patches/0106-Add-EntityTeleportEndGatewayEvent.patch b/Spigot-API-Patches/0106-Add-EntityTeleportEndGatewayEvent.patch index 93a1468bee..e5c48d4087 100644 --- a/Spigot-API-Patches/0106-Add-EntityTeleportEndGatewayEvent.patch +++ b/Spigot-API-Patches/0106-Add-EntityTeleportEndGatewayEvent.patch @@ -1,4 +1,4 @@ -From dbf6e3d0d411003e38f9fd4f9ccf156d9aa05a5b Mon Sep 17 00:00:00 2001 +From 6a88e74da088408754dfd5b6e3d59087c944776b Mon Sep 17 00:00:00 2001 From: Shane Freeder Date: Sat, 9 Jun 2018 13:08:21 +0100 Subject: [PATCH] Add EntityTeleportEndGatewayEvent @@ -42,5 +42,5 @@ index 000000000..bfc69a43c + +} -- -2.25.1 +2.26.2 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 04ccf6b833..baa31bdd35 100644 --- a/Spigot-API-Patches/0107-Make-shield-blocking-delay-configurable.patch +++ b/Spigot-API-Patches/0107-Make-shield-blocking-delay-configurable.patch @@ -1,4 +1,4 @@ -From 278caaa37f9a01a2a38dbf52f97db27232522fc8 Mon Sep 17 00:00:00 2001 +From 52d0dd030ca757e4e77bc89310a37437bb712058 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 @@ -29,5 +29,5 @@ index ae712e76d..896b1971c 100644 // Paper end } -- -2.25.1 +2.26.2 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 fcf38842e0..74d955707a 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 2f6d3a08ba3c5b04124d61e35d4d1161c49e9f29 Mon Sep 17 00:00:00 2001 +From 80f0a8045024b522a4a136caaa43d047b16bbd81 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 @@ -49,5 +49,5 @@ index 18c5e31ab..37dbc12eb 100644 this.projectile = projectile; this.force = force; -- -2.25.1 +2.26.2 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 3d380119a0..56cd45e8a7 100644 --- a/Spigot-API-Patches/0109-Add-getNearbyXXX-methods-to-Location.patch +++ b/Spigot-API-Patches/0109-Add-getNearbyXXX-methods-to-Location.patch @@ -1,4 +1,4 @@ -From 2b65b073a7c9d25f47d57bfb6e2db1cfb0797758 Mon Sep 17 00:00:00 2001 +From 78e9e1179adff0653d6159a7cf76ae8970e298d1 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 @@ -274,5 +274,5 @@ index f61bf28af..4cf22afc3 100644 @Override public boolean equals(Object obj) { -- -2.25.1 +2.26.2 diff --git a/Spigot-API-Patches/0110-PlayerReadyArrowEvent.patch b/Spigot-API-Patches/0110-PlayerReadyArrowEvent.patch index 278dcc9092..642dfe2982 100644 --- a/Spigot-API-Patches/0110-PlayerReadyArrowEvent.patch +++ b/Spigot-API-Patches/0110-PlayerReadyArrowEvent.patch @@ -1,4 +1,4 @@ -From d5f5877c0b11a8379a0d9efdb9dfba3293d7c170 Mon Sep 17 00:00:00 2001 +From dd28b91b6be56103ed65db1b8169d2f8a8f585f2 Mon Sep 17 00:00:00 2001 From: Aikar Date: Mon, 18 Jun 2018 01:09:27 -0400 Subject: [PATCH] PlayerReadyArrowEvent @@ -106,5 +106,5 @@ index 000000000..5d04a22fd + } +} -- -2.25.1 +2.26.2 diff --git a/Spigot-API-Patches/0111-Add-EntityKnockbackByEntityEvent.patch b/Spigot-API-Patches/0111-Add-EntityKnockbackByEntityEvent.patch index 91fc5c3abe..5934fd4b4d 100644 --- a/Spigot-API-Patches/0111-Add-EntityKnockbackByEntityEvent.patch +++ b/Spigot-API-Patches/0111-Add-EntityKnockbackByEntityEvent.patch @@ -1,4 +1,4 @@ -From 4591321a0b6f1215bbcd8ee48963b40a0ac2a9ca Mon Sep 17 00:00:00 2001 +From 1f19271ba32e886dbad2f7395d700d65a6b3ac8f Mon Sep 17 00:00:00 2001 From: Brokkonaut Date: Mon, 18 Jun 2018 15:40:39 +0200 Subject: [PATCH] Add EntityKnockbackByEntityEvent @@ -93,5 +93,5 @@ index 000000000..9efecabab + } +} -- -2.25.1 +2.26.2 diff --git a/Spigot-API-Patches/0112-Expand-Explosions-API.patch b/Spigot-API-Patches/0112-Expand-Explosions-API.patch index 5ddc3eec0c..aaf556d7b3 100644 --- a/Spigot-API-Patches/0112-Expand-Explosions-API.patch +++ b/Spigot-API-Patches/0112-Expand-Explosions-API.patch @@ -1,4 +1,4 @@ -From 33a58559367c3aba8d13a3864bdc50ac08370bf8 Mon Sep 17 00:00:00 2001 +From 004f0a6533e7b89cc5fbd24a2dad7caa773bf04b Mon Sep 17 00:00:00 2001 From: Aikar Date: Tue, 19 Dec 2017 16:24:42 -0500 Subject: [PATCH] Expand Explosions API @@ -199,5 +199,5 @@ index 085c7a42c..08985f77d 100644 * Creates explosion at given coordinates with given power and optionally * setting blocks on fire or breaking blocks. -- -2.25.1 +2.26.2 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 7af970f42e..836fdc1138 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,4 +1,4 @@ -From 3a0213a42c48222049d43905151dae92adfd80a6 Mon Sep 17 00:00:00 2001 +From 03056ab98781c82b614f33e7c1bdb55c0f28c766 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 @@ -160,5 +160,5 @@ index 125b74dd8..4940ba6a9 100644 // Paper end } -- -2.25.1 +2.26.2 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 23c29095ac..807eac4579 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 2365cae4aeaef3a93d47852e7b3dd1eeeabd58f5 Mon Sep 17 00:00:00 2001 +From 5bf82026c695b582aeb438cd65ab64f92ab006c6 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 @@ -51,5 +51,5 @@ index 896b1971c..4af8e680d 100644 // Paper end } -- -2.25.1 +2.26.2 diff --git a/Spigot-API-Patches/0115-RangedEntity-API.patch b/Spigot-API-Patches/0115-RangedEntity-API.patch index 1ffdc6fec6..12a67289a9 100644 --- a/Spigot-API-Patches/0115-RangedEntity-API.patch +++ b/Spigot-API-Patches/0115-RangedEntity-API.patch @@ -1,4 +1,4 @@ -From 746faf7473c797fa89e6aa95fbddcfc48cdbb07b Mon Sep 17 00:00:00 2001 +From 92d3c606d3c2a56a6dbaa1f866fa1cef68d3559f Mon Sep 17 00:00:00 2001 From: Aikar Date: Tue, 26 Jun 2018 21:34:40 -0400 Subject: [PATCH] RangedEntity API @@ -158,5 +158,5 @@ index 3bc332ee7..426d36933 100644 +public interface Wither extends Monster, Boss, RangedEntity { // Paper } -- -2.25.1 +2.26.2 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 399a301e87..895f60238c 100644 --- a/Spigot-API-Patches/0116-Add-World.getEntity-UUID-API.patch +++ b/Spigot-API-Patches/0116-Add-World.getEntity-UUID-API.patch @@ -1,4 +1,4 @@ -From a8e3517a9a0e8cffda4404490709e6904a08fbf4 Mon Sep 17 00:00:00 2001 +From 3f1bf9ea671bbc30d7f5406b64896ffbb25f58ff 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 @@ -27,5 +27,5 @@ index 08985f77d..889756b1c 100644 * Returns a list of entities within a bounding box centered around a * Location. -- -2.25.1 +2.26.2 diff --git a/Spigot-API-Patches/0117-InventoryCloseEvent-Reason-API.patch b/Spigot-API-Patches/0117-InventoryCloseEvent-Reason-API.patch index 83fcc0f979..703cdaf4cf 100644 --- a/Spigot-API-Patches/0117-InventoryCloseEvent-Reason-API.patch +++ b/Spigot-API-Patches/0117-InventoryCloseEvent-Reason-API.patch @@ -1,4 +1,4 @@ -From 9dd56c5585f21d0b8c82ca0b4989fa7eb31ad9f5 Mon Sep 17 00:00:00 2001 +From c7c413ab5b8a9bea7918c7d2b1e309500ecd73a7 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 2d413d720..79569a329 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 @@ -92,5 +92,5 @@ index 5861247c1..21ad8888c 100644 /** -- -2.25.1 +2.26.2 diff --git a/Spigot-API-Patches/0118-Entity-getChunk-API.patch b/Spigot-API-Patches/0118-Entity-getChunk-API.patch index b7df8ac01b..0667d8aec1 100644 --- a/Spigot-API-Patches/0118-Entity-getChunk-API.patch +++ b/Spigot-API-Patches/0118-Entity-getChunk-API.patch @@ -1,4 +1,4 @@ -From f87949c1490fb4da1516c30a744806bc3769070e Mon Sep 17 00:00:00 2001 +From 144edfa492185db21fd3fd9dacf6ff5adc8f6989 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 e2952209d..a8dbf282d 100644 // Paper end } -- -2.25.1 +2.26.2 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 fc0827b2c3..9df8d3083c 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 859aa7959514bd7c7c6156727967c3382bb6573e Mon Sep 17 00:00:00 2001 +From 4b19178484cdd9010e318e7dce34581b5bf6e3a1 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 @@ -62,5 +62,5 @@ index 32ec68b48..8ff228ced 100644 JavaPlugin jPlugin = (JavaPlugin) plugin; -- -2.25.1 +2.26.2 diff --git a/Spigot-API-Patches/0120-EnderDragon-Events.patch b/Spigot-API-Patches/0120-EnderDragon-Events.patch index aaae5c8788..1ccddee514 100644 --- a/Spigot-API-Patches/0120-EnderDragon-Events.patch +++ b/Spigot-API-Patches/0120-EnderDragon-Events.patch @@ -1,4 +1,4 @@ -From d0a0e23c72f948b3c7e07f48e73516b5c102253d Mon Sep 17 00:00:00 2001 +From 2cb1756d46eb48a7988d0b1980961165f2f3ab8c Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Sat, 21 Jul 2018 01:51:05 -0500 Subject: [PATCH] EnderDragon Events @@ -224,5 +224,5 @@ index 000000000..8414bd805 + } +} -- -2.25.1 +2.26.2 diff --git a/Spigot-API-Patches/0121-PlayerLaunchProjectileEvent.patch b/Spigot-API-Patches/0121-PlayerLaunchProjectileEvent.patch index 423580fce4..4ce3ad0944 100644 --- a/Spigot-API-Patches/0121-PlayerLaunchProjectileEvent.patch +++ b/Spigot-API-Patches/0121-PlayerLaunchProjectileEvent.patch @@ -1,4 +1,4 @@ -From d5c86c51ddc1719c0e082c9511c566b5643f6e52 Mon Sep 17 00:00:00 2001 +From ef9dc8ae78cf9fd1838a2e266c50b4c5f2c7cc34 Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Sat, 21 Jul 2018 03:10:50 -0500 Subject: [PATCH] PlayerLaunchProjectileEvent @@ -94,5 +94,5 @@ index 000000000..9074b2ede + } +} -- -2.25.1 +2.26.2 diff --git a/Spigot-API-Patches/0122-PlayerElytraBoostEvent.patch b/Spigot-API-Patches/0122-PlayerElytraBoostEvent.patch index bec1746673..34fe915ec7 100644 --- a/Spigot-API-Patches/0122-PlayerElytraBoostEvent.patch +++ b/Spigot-API-Patches/0122-PlayerElytraBoostEvent.patch @@ -1,4 +1,4 @@ -From 3dce11e6ed387ab8dde375eba3768eac4b62a396 Mon Sep 17 00:00:00 2001 +From cd43998087a617510cac0516b62db5f5274a0662 Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Sat, 21 Jul 2018 01:59:53 -0500 Subject: [PATCH] PlayerElytraBoostEvent @@ -96,5 +96,5 @@ index 000000000..e9a76a25f + } +} -- -2.25.1 +2.26.2 diff --git a/Spigot-API-Patches/0123-EntityTransformedEvent.patch b/Spigot-API-Patches/0123-EntityTransformedEvent.patch index 6abc5c416a..b99aab73b2 100644 --- a/Spigot-API-Patches/0123-EntityTransformedEvent.patch +++ b/Spigot-API-Patches/0123-EntityTransformedEvent.patch @@ -1,4 +1,4 @@ -From 98308b2255a82eae37913639b9505bd99b72b53f Mon Sep 17 00:00:00 2001 +From 6951e644dd75d4299f00deddba74e92daafebb66 Mon Sep 17 00:00:00 2001 From: Anthony MacAllister Date: Thu, 26 Jul 2018 15:28:53 -0400 Subject: [PATCH] EntityTransformedEvent @@ -103,5 +103,5 @@ index 000000000..12194f1fc + } +} -- -2.25.1 +2.26.2 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 e80792b6f4..6027e04e23 100644 --- a/Spigot-API-Patches/0124-Allow-disabling-armour-stand-ticking.patch +++ b/Spigot-API-Patches/0124-Allow-disabling-armour-stand-ticking.patch @@ -1,4 +1,4 @@ -From a0334c3f2d894c40273a3e66f410feccb1ca4e0e Mon Sep 17 00:00:00 2001 +From 81bba63c4870342f386d6a505473878d15487067 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 @@ -31,5 +31,5 @@ index 6a854d7cf..c8c08f1f2 100644 // Paper end } -- -2.25.1 +2.26.2 diff --git a/Spigot-API-Patches/0125-SkeletonHorse-Additions.patch b/Spigot-API-Patches/0125-SkeletonHorse-Additions.patch index 5bdf643474..238cab7886 100644 --- a/Spigot-API-Patches/0125-SkeletonHorse-Additions.patch +++ b/Spigot-API-Patches/0125-SkeletonHorse-Additions.patch @@ -1,4 +1,4 @@ -From a2f450f2aa73085fed9feeb9d6dc9989fc27c051 Mon Sep 17 00:00:00 2001 +From f51bcff92d8ae89a6a86234b508d4778a30e8b2d Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Fri, 27 Jul 2018 22:36:17 -0500 Subject: [PATCH] SkeletonHorse Additions @@ -76,5 +76,5 @@ index b2c6b6a86..ba9983463 100644 + // Paper end +} -- -2.25.1 +2.26.2 diff --git a/Spigot-API-Patches/0126-Expand-Location-Manipulation-API.patch b/Spigot-API-Patches/0126-Expand-Location-Manipulation-API.patch index 9c8884d7e2..da7cd9ba2b 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 f6826aa1119b3bb9869686340d6bd9ca0149162a Mon Sep 17 00:00:00 2001 +From af529b775e493033aad54122093c513126351a22 Mon Sep 17 00:00:00 2001 From: Aikar Date: Wed, 25 Jul 2018 01:36:07 -0400 Subject: [PATCH] Expand Location Manipulation API @@ -65,5 +65,5 @@ index ac3c8eef5..f87ecd0a7 100644 * @return A new location where X/Y/Z are on the Block location (integer value of X/Y/Z) */ -- -2.25.1 +2.26.2 diff --git a/Spigot-API-Patches/0127-Expand-ArmorStand-API.patch b/Spigot-API-Patches/0127-Expand-ArmorStand-API.patch index 807bbd9cfd..35a5904ac7 100644 --- a/Spigot-API-Patches/0127-Expand-ArmorStand-API.patch +++ b/Spigot-API-Patches/0127-Expand-ArmorStand-API.patch @@ -1,4 +1,4 @@ -From 81e2600e41b4d0effec860a2b3bcc88079036a82 Mon Sep 17 00:00:00 2001 +From cce65d9377cfd96529bc8fb770758fb9208a0650 Mon Sep 17 00:00:00 2001 From: willies952002 Date: Thu, 26 Jul 2018 02:22:44 -0400 Subject: [PATCH] Expand ArmorStand API @@ -110,5 +110,5 @@ index c8c08f1f2..af70bac79 100644 // Paper end } -- -2.25.1 +2.26.2 diff --git a/Spigot-API-Patches/0128-AnvilDamageEvent.patch b/Spigot-API-Patches/0128-AnvilDamageEvent.patch index 4d41e702b9..74b506ba70 100644 --- a/Spigot-API-Patches/0128-AnvilDamageEvent.patch +++ b/Spigot-API-Patches/0128-AnvilDamageEvent.patch @@ -1,4 +1,4 @@ -From e80d7db6426808f73ae20e5cc2ef3e3badf9d617 Mon Sep 17 00:00:00 2001 +From c46be2703c06acabbaa89b5a7dbcd5674a5b9664 Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Fri, 20 Jul 2018 23:36:55 -0500 Subject: [PATCH] AnvilDamageEvent @@ -159,5 +159,5 @@ index 000000000..a83c286c1 + } +} -- -2.25.1 +2.26.2 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 1e32c35224..9566752f7b 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 76b6f38c7f71dac898238429577cea7214837cce Mon Sep 17 00:00:00 2001 +From 6e4fb0cc9482d789961ef8e386fb3fa8d6f17a4c 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 @@ -136,5 +136,5 @@ index f188cd4f3..1941c9f49 100644 @Test public void testRemovePermissionByNameLower() { -- -2.25.1 +2.26.2 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 4452764c9f..86bec059c2 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 76cedcbfc0bd505fe0fea8a76545a8e93cc437ec Mon Sep 17 00:00:00 2001 +From 8a987c7ba39c69da4de86656c748a60dfb163ac0 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 77c3a6e5c..56f1cc2d7 100644 @Override public HandlerList getHandlers() { -- -2.25.1 +2.26.2 diff --git a/Spigot-API-Patches/0131-Add-TNTPrimeEvent.patch b/Spigot-API-Patches/0131-Add-TNTPrimeEvent.patch index 9b5925e957..778bdbb23e 100644 --- a/Spigot-API-Patches/0131-Add-TNTPrimeEvent.patch +++ b/Spigot-API-Patches/0131-Add-TNTPrimeEvent.patch @@ -1,4 +1,4 @@ -From 809ca940b9fd8f5443c191773f75b96ffe05b0eb Mon Sep 17 00:00:00 2001 +From c3423f534450b937a1ed44e070f3c38eaa622ef9 Mon Sep 17 00:00:00 2001 From: Mark Vainomaa Date: Sun, 15 Jul 2018 22:17:55 +0300 Subject: [PATCH] Add TNTPrimeEvent @@ -125,5 +125,5 @@ index 000000000..73dabb82c + } +} -- -2.25.1 +2.26.2 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 b25c30ea68..ca6f25ac1c 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 21d2ea6db9a32fce496f5c19f001cbdfdc66a8c2 Mon Sep 17 00:00:00 2001 +From e5775c58752c8ac7bb3d6d079829a11708748f61 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 @@ -71,5 +71,5 @@ index 889756b1c..e5b76d59f 100644 * Checks if the specified {@link Chunk} is loaded * -- -2.25.1 +2.26.2 diff --git a/Spigot-API-Patches/0133-Async-Chunks-API.patch b/Spigot-API-Patches/0133-Async-Chunks-API.patch index e0867c4792..2a62945f70 100644 --- a/Spigot-API-Patches/0133-Async-Chunks-API.patch +++ b/Spigot-API-Patches/0133-Async-Chunks-API.patch @@ -1,4 +1,4 @@ -From ecbc7e47d76eba6915b81c86070e092349eb7d5b Mon Sep 17 00:00:00 2001 +From 36717a78ace022da59859e222d8acb972786fa97 Mon Sep 17 00:00:00 2001 From: Aikar Date: Mon, 29 Feb 2016 17:43:33 -0600 Subject: [PATCH] Async Chunks API @@ -406,5 +406,5 @@ index b4069dbf3..45e0dffe6 100644 * Returns a list of entities within a bounding box centered around this * entity -- -2.25.1 +2.26.2 diff --git a/Spigot-API-Patches/0134-Make-EnderDragon-extend-Mob.patch b/Spigot-API-Patches/0134-Make-EnderDragon-extend-Mob.patch index 86103f79b4..313cbbc4f4 100644 --- a/Spigot-API-Patches/0134-Make-EnderDragon-extend-Mob.patch +++ b/Spigot-API-Patches/0134-Make-EnderDragon-extend-Mob.patch @@ -1,4 +1,4 @@ -From 002e1330de5f20fae98f1cb6d818c0a1053d75bd Mon Sep 17 00:00:00 2001 +From 5d5fb9f844259c06a9aa8599f52eae3bb6888847 Mon Sep 17 00:00:00 2001 From: Aikar Date: Fri, 10 Aug 2018 22:08:34 -0400 Subject: [PATCH] Make EnderDragon extend Mob @@ -18,5 +18,5 @@ index c14278d2c..92da609fb 100644 /** * Represents a phase or action that an Ender Dragon can perform. -- -2.25.1 +2.26.2 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 7790969df2..dfe5ba6b13 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,4 +1,4 @@ -From 7e804838961e0fbee0a360a40d4f27cf1caf3ef4 Mon Sep 17 00:00:00 2001 +From f7c4241e30ac69f9ea8daa093e1dc8000ceb9eb3 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 @@ -37,5 +37,5 @@ index 0bbef14a9..11b691cf5 100644 /** * Checks if the chunk is loaded. -- -2.25.1 +2.26.2 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 e33771fdad..565a700d6b 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,4 +1,4 @@ -From 5299bd10c554dafa755cac2640c176f301a4a246 Mon Sep 17 00:00:00 2001 +From a98a64b6802dbc204e71451a2815277454118c16 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 @@ -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.25.1 +2.26.2 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 a6e5e64c6e..041741151a 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 47589b69cab026a1e594a7e7ed02c600bee7eb3f Mon Sep 17 00:00:00 2001 +From 0c951dc5e7f250bd4b5e57731eb714b1a83634ef 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 @@ -168,5 +168,5 @@ index 8154093df..41f6b8491 100644 * Gets the Location of the block * -- -2.25.1 +2.26.2 diff --git a/Spigot-API-Patches/0138-Slime-Pathfinder-Events.patch b/Spigot-API-Patches/0138-Slime-Pathfinder-Events.patch index cf845ffc6f..65f8472c26 100644 --- a/Spigot-API-Patches/0138-Slime-Pathfinder-Events.patch +++ b/Spigot-API-Patches/0138-Slime-Pathfinder-Events.patch @@ -1,4 +1,4 @@ -From f30264bb1ff8499182a99042f6d009794f7c654c Mon Sep 17 00:00:00 2001 +From 98f7e098cc39d66307ca7a4fd13377df75c29229 Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Fri, 24 Aug 2018 08:18:27 -0500 Subject: [PATCH] Slime Pathfinder Events @@ -216,5 +216,5 @@ index 1119e26e2..c4791f95d 100644 + // Paper end } -- -2.25.1 +2.26.2 diff --git a/Spigot-API-Patches/0139-isChunkGenerated-API.patch b/Spigot-API-Patches/0139-isChunkGenerated-API.patch index 52117d63b5..19882a76a9 100644 --- a/Spigot-API-Patches/0139-isChunkGenerated-API.patch +++ b/Spigot-API-Patches/0139-isChunkGenerated-API.patch @@ -1,4 +1,4 @@ -From 6b081b6bfe90a151674b871c8bb100e2f6183aad Mon Sep 17 00:00:00 2001 +From 8f5e0cccb4a48b21d0d4bcf4e87474ddcfc9615b 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 @@ -56,5 +56,5 @@ index 64308c1f0..b7ad4f566 100644 * This is the Legacy API before Java 8 was supported. Java 8 Consumer is provided, * as well as future support -- -2.25.1 +2.26.2 diff --git a/Spigot-API-Patches/0140-Add-More-Creeper-API.patch b/Spigot-API-Patches/0140-Add-More-Creeper-API.patch index 39dca593b0..863de13eac 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 6e45063b337b876bb23a49230ab2389bea6d1e7e Mon Sep 17 00:00:00 2001 +From ef8376f5dd7ea665773c7dea55b6878db985d791 Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Fri, 24 Aug 2018 11:50:16 -0500 Subject: [PATCH] Add More Creeper API @@ -97,5 +97,5 @@ index 1b8ece6df..faaeb44a9 100644 + // Paper end } -- -2.25.1 +2.26.2 diff --git a/Spigot-API-Patches/0141-Add-PhantomPreSpawnEvent.patch b/Spigot-API-Patches/0141-Add-PhantomPreSpawnEvent.patch index 4c5823e7a1..65ae192ab7 100644 --- a/Spigot-API-Patches/0141-Add-PhantomPreSpawnEvent.patch +++ b/Spigot-API-Patches/0141-Add-PhantomPreSpawnEvent.patch @@ -1,4 +1,4 @@ -From b6ff2c92913deb4a8612f65f21a4a065d81527f8 Mon Sep 17 00:00:00 2001 +From 1f4f38a8c690ff17d12462ffe4661419db8d45b8 Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Sat, 25 Aug 2018 19:56:42 -0500 Subject: [PATCH] Add PhantomPreSpawnEvent @@ -70,5 +70,5 @@ index 1a1044edc..ed4d417c2 100644 + // Paper end } -- -2.25.1 +2.26.2 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 7cf9406a09..699b7fe899 100644 --- a/Spigot-API-Patches/0142-Add-source-block-to-BlockPhysicsEvent.patch +++ b/Spigot-API-Patches/0142-Add-source-block-to-BlockPhysicsEvent.patch @@ -1,4 +1,4 @@ -From 2af8c345ceb67410d7df03dba9fa9d566c2ab6f0 Mon Sep 17 00:00:00 2001 +From 12cdf023a2742dcd89389af019fbcda32bbcc017 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 @@ -23,5 +23,5 @@ index e3a5f5824..c382f9fc2 100644 this(block, changed, block); } -- -2.25.1 +2.26.2 diff --git a/Spigot-API-Patches/0143-Inventory-removeItemAnySlot.patch b/Spigot-API-Patches/0143-Inventory-removeItemAnySlot.patch index dfba35744e..366e22dc60 100644 --- a/Spigot-API-Patches/0143-Inventory-removeItemAnySlot.patch +++ b/Spigot-API-Patches/0143-Inventory-removeItemAnySlot.patch @@ -1,4 +1,4 @@ -From 81bdb84ec777d5788fddec6b264cec11618b8533 Mon Sep 17 00:00:00 2001 +From ed0362a4aef4fd5078ae307ae0ed1b25f8021577 Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Tue, 28 Aug 2018 23:04:06 -0400 Subject: [PATCH] Inventory#removeItemAnySlot @@ -44,5 +44,5 @@ index 5a38d8f13..01fe217df 100644 * Returns all ItemStacks from the inventory * -- -2.25.1 +2.26.2 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 231a5abbf5..497bd3166a 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 8f319b7bea415a80ddbe07e91c4a82b9026b1ba8 Mon Sep 17 00:00:00 2001 +From e92576141196eb20f116f3d5fff26f2eb737a9c5 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 @@ -147,5 +147,5 @@ index 4af8e680d..5e9ca6f3d 100644 * Gets the last two blocks along the living entity's line of sight. *

-- -2.25.1 +2.26.2 diff --git a/Spigot-API-Patches/0145-Improve-death-events.patch b/Spigot-API-Patches/0145-Improve-death-events.patch index fadffe0640..c32960aee1 100644 --- a/Spigot-API-Patches/0145-Improve-death-events.patch +++ b/Spigot-API-Patches/0145-Improve-death-events.patch @@ -1,4 +1,4 @@ -From a504a2b9273474de1c0ac1ac7b89d4a1b0fa00a7 Mon Sep 17 00:00:00 2001 +From a3424f4e649c8b2c866e08367d1bd423deda90d1 Mon Sep 17 00:00:00 2001 From: Phoenix616 Date: Tue, 21 Aug 2018 01:32:28 +0100 Subject: [PATCH] Improve death events @@ -180,5 +180,5 @@ index a5984ab06..e19a3df9a 100644 + // Paper end } -- -2.25.1 +2.26.2 diff --git a/Spigot-API-Patches/0146-Mob-Pathfinding-API.patch b/Spigot-API-Patches/0146-Mob-Pathfinding-API.patch index 0abd523f54..f2867624a6 100644 --- a/Spigot-API-Patches/0146-Mob-Pathfinding-API.patch +++ b/Spigot-API-Patches/0146-Mob-Pathfinding-API.patch @@ -1,4 +1,4 @@ -From d0971585476485723ada331a0498d6fff6aee347 Mon Sep 17 00:00:00 2001 +From 3918a41aea8da6963873adfc9219b07265a7c0a6 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sun, 9 Sep 2018 12:39:06 -0400 Subject: [PATCH] Mob Pathfinding API @@ -216,5 +216,5 @@ index be9334a8b..b13228781 100644 * Instructs this Mob to set the specified LivingEntity as its target. *

-- -2.25.1 +2.26.2 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 4f5ae7739d..5d4107d2de 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 b319beedc36811afee1dff795c3a29f7644ac8a2 Mon Sep 17 00:00:00 2001 +From 4544bc81906853de4bea0111e8bb6e633eac83d5 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 c37d7fca0..3600b4c84 100644 // Spigot start -- -2.25.1 +2.26.2 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 d73580ae6d..41aecbe671 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 d6d9d785dfd611f7ce87e64bb2bfa54f08277eb0 Mon Sep 17 00:00:00 2001 +From 0fc7e321f3796ad0dabeed59fce6ceb0f778a306 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 @@ -318,5 +318,5 @@ index f2e9f2753..7e0b1d363 100644 + // Paper end } -- -2.25.1 +2.26.2 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 620954adb7..0523aeadef 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 1f6adca11910cc88f680825dbc964e7cdc249dfe Mon Sep 17 00:00:00 2001 +From e58674a97861595d28d7da7ac2aa982037fb69e4 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 @@ -112,5 +112,5 @@ index 497775f7f..c94e4cdb5 100644 } -- -2.25.1 +2.26.2 diff --git a/Spigot-API-Patches/0150-Add-ItemStackRecipeChoice-Draft-API.patch b/Spigot-API-Patches/0150-Add-ItemStackRecipeChoice-Draft-API.patch index e03864aa0f..aa4f9aaa46 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 3fda3c194e7401c8a71415625cd66b7c9fa8dbc1 Mon Sep 17 00:00:00 2001 +From 6c31e06baa1fd1383189f4bc8a52e504ee19373b Mon Sep 17 00:00:00 2001 From: Aikar Date: Thu, 13 Sep 2018 21:39:26 -0400 Subject: [PATCH] Add ItemStackRecipeChoice Draft API @@ -65,5 +65,5 @@ index 000000000..43e6576b1 + } +} -- -2.25.1 +2.26.2 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 8ccdf77a9c..36130bb862 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 b4bda8dc7d7aa8013a4ae0688e232564188bdf66 Mon Sep 17 00:00:00 2001 +From 5071423004b2098afa9ca8985acb99c4a0202ff0 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 @@ -37,5 +37,5 @@ index c5a8c96fa..9063cf370 100644 @Override public FurnaceInventory getInventory(); -- -2.25.1 +2.26.2 diff --git a/Spigot-API-Patches/0152-PreSpawnerSpawnEvent.patch b/Spigot-API-Patches/0152-PreSpawnerSpawnEvent.patch index 63f25b38cc..0b04b53e2a 100644 --- a/Spigot-API-Patches/0152-PreSpawnerSpawnEvent.patch +++ b/Spigot-API-Patches/0152-PreSpawnerSpawnEvent.patch @@ -1,4 +1,4 @@ -From 57a505b782c36e3f017b9c7c31bc8187bb27a17b Mon Sep 17 00:00:00 2001 +From 40a49656a4e036c386db9681efd960a27aedf0b7 Mon Sep 17 00:00:00 2001 From: Phoenix616 Date: Tue, 18 Sep 2018 23:50:10 +0100 Subject: [PATCH] PreSpawnerSpawnEvent @@ -44,5 +44,5 @@ index 000000000..48cff0635 + } +} -- -2.25.1 +2.26.2 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 cfccc5bf98..a67cbcfc7d 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 5b62e9e30d76547b6ce8093e48394f423523816d Mon Sep 17 00:00:00 2001 +From fdee18aff4e9d98ff3663693cafbe5f8c362dc73 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 @@ -23,5 +23,5 @@ index a97631474..f0dff145a 100644 this.operation = operation; this.slot = slot; -- -2.25.1 +2.26.2 diff --git a/Spigot-API-Patches/0154-Material-API-additions.patch b/Spigot-API-Patches/0154-Material-API-additions.patch index a8424c0e66..47b8505bd2 100644 --- a/Spigot-API-Patches/0154-Material-API-additions.patch +++ b/Spigot-API-Patches/0154-Material-API-additions.patch @@ -1,4 +1,4 @@ -From 58de6a67866af196b860dcce47831eb71f05dd25 Mon Sep 17 00:00:00 2001 +From 4f5eb0e50f2fe421f3b703457b11f30f9476441f 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 f28da6efd..1f2dbd68c 100644 * Do not use for any reason. * -- -2.25.1 +2.26.2 diff --git a/Spigot-API-Patches/0155-Add-Material-Tags.patch b/Spigot-API-Patches/0155-Add-Material-Tags.patch index 622fd4532d..89c763b9e0 100644 --- a/Spigot-API-Patches/0155-Add-Material-Tags.patch +++ b/Spigot-API-Patches/0155-Add-Material-Tags.patch @@ -1,4 +1,4 @@ -From 5fd4b315b2daa187f630169c76528a3e7731878e Mon Sep 17 00:00:00 2001 +From e9fc066ffcf858dd831b294140e8a8277fb7c952 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 61993528e..5f9d34824 100644 Server.class.getMethod("getPluginManager"), new MethodHandler() { -- -2.25.1 +2.26.2 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 1b460d126f..c5d033f397 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,4 +1,4 @@ -From eb1540ebf1461127e32f7a4148cd8afc0e8aa8b8 Mon Sep 17 00:00:00 2001 +From 5a7bb765eae8bfe4c0cb221d8e555aa966df7cec 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 @@ -39,5 +39,5 @@ index 6b61c4ab7..c34a3ea7b 100644 + // Paper end } -- -2.25.1 +2.26.2 diff --git a/Spigot-API-Patches/0157-Add-LivingEntity-getTargetEntity.patch b/Spigot-API-Patches/0157-Add-LivingEntity-getTargetEntity.patch index a52173033d..c052d595f8 100644 --- a/Spigot-API-Patches/0157-Add-LivingEntity-getTargetEntity.patch +++ b/Spigot-API-Patches/0157-Add-LivingEntity-getTargetEntity.patch @@ -1,4 +1,4 @@ -From 0061b2f5f623dd39ff2c0929ec86e8dfc779a5ce Mon Sep 17 00:00:00 2001 +From 3f5857591b97ffaece41cc319cc130cb015f8ef1 Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Sat, 22 Sep 2018 00:32:53 -0500 Subject: [PATCH] Add LivingEntity#getTargetEntity @@ -104,5 +104,5 @@ index 5e9ca6f3d..deab50525 100644 /** -- -2.25.1 +2.26.2 diff --git a/Spigot-API-Patches/0158-Add-sun-related-API.patch b/Spigot-API-Patches/0158-Add-sun-related-API.patch index b25922f36f..8fbbf8da1d 100644 --- a/Spigot-API-Patches/0158-Add-sun-related-API.patch +++ b/Spigot-API-Patches/0158-Add-sun-related-API.patch @@ -1,4 +1,4 @@ -From af3b3f36b1bfd7b88dccbb63fb634f73292be1ed Mon Sep 17 00:00:00 2001 +From 7bfc23854585ea3d9b0281708668e638eb17f2a3 Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Sun, 7 Oct 2018 00:54:15 -0500 Subject: [PATCH] Add sun related API @@ -44,5 +44,5 @@ index b13228781..d726453c0 100644 /** -- -2.25.1 +2.26.2 diff --git a/Spigot-API-Patches/0159-Here-s-Johnny.patch b/Spigot-API-Patches/0159-Here-s-Johnny.patch index ff454f6fc7..15a84bd9cf 100644 --- a/Spigot-API-Patches/0159-Here-s-Johnny.patch +++ b/Spigot-API-Patches/0159-Here-s-Johnny.patch @@ -1,4 +1,4 @@ -From 45d90aea9327e590adfe6638ba2c1326f435e5f3 Mon Sep 17 00:00:00 2001 +From 18dd50c26084dbf8b114d018adc5d9104dc96153 Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Fri, 12 Oct 2018 01:37:16 -0500 Subject: [PATCH] Here's Johnny! @@ -41,5 +41,5 @@ index b8ea68a8f..c5d9e76a6 100644 + // Paper end +} -- -2.25.1 +2.26.2 diff --git a/Spigot-API-Patches/0160-Turtle-API.patch b/Spigot-API-Patches/0160-Turtle-API.patch index 4c0255f8ce..4d04c46219 100644 --- a/Spigot-API-Patches/0160-Turtle-API.patch +++ b/Spigot-API-Patches/0160-Turtle-API.patch @@ -1,4 +1,4 @@ -From 6123dea51cf4a17b60b4788b4fb7c6101c6d93d2 Mon Sep 17 00:00:00 2001 +From dbd9830e09e09d62ea1cd51af8396cf2fcaa21db Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Fri, 28 Sep 2018 17:08:09 -0500 Subject: [PATCH] Turtle API @@ -282,5 +282,5 @@ index 0a4cd2993..5375ea140 100644 + // Paper end +} -- -2.25.1 +2.26.2 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 37ee794073..8c9aa91b49 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 b586a727562b147c4456f3b38170d037ef0090ef Mon Sep 17 00:00:00 2001 +From f0f27645b1c2040ec5979ea93a1fc41f24bbee2e 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 @@ -57,5 +57,5 @@ index cb9e9f369..a15f70ff4 100644 // Paper end } -- -2.25.1 +2.26.2 diff --git a/Spigot-API-Patches/0162-Add-spectator-target-events.patch b/Spigot-API-Patches/0162-Add-spectator-target-events.patch index 3da4e992ae..312ff5252d 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 6d1e0775a1dc675aa0ff6a37d44599988bcef6cd Mon Sep 17 00:00:00 2001 +From 0ac2bfd09b014ae5b3e37bb9b9a5a6beb43355e4 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 @@ -140,5 +140,5 @@ index 000000000..693d119ab + } +} -- -2.25.1 +2.26.2 diff --git a/Spigot-API-Patches/0163-Add-more-Witch-API.patch b/Spigot-API-Patches/0163-Add-more-Witch-API.patch index 63b0565ed9..5b82040f1a 100644 --- a/Spigot-API-Patches/0163-Add-more-Witch-API.patch +++ b/Spigot-API-Patches/0163-Add-more-Witch-API.patch @@ -1,4 +1,4 @@ -From 39935bbe50ce4ad3af22bf448e7c125375791908 Mon Sep 17 00:00:00 2001 +From c9407327b961255a69a6c04d8771709091f81bc9 Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Fri, 12 Oct 2018 03:47:26 -0500 Subject: [PATCH] Add more Witch API @@ -53,5 +53,5 @@ index aa88aede6..cd8d0a20e 100644 + // Paper end } -- -2.25.1 +2.26.2 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 5f42e4c7b3..f9de24ffaf 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,4 +1,4 @@ -From cf9036d48345c80a7408cb639b4dd9924a2d1cdc Mon Sep 17 00:00:00 2001 +From b301fb49d5cfc62a1755b694ca2c349c3eab1fa9 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 @@ -56,5 +56,5 @@ index 03bdc1622..0b0d1bd7c 100644 for (String line : permissionMessage.replace("", permission).split("\n")) { target.sendMessage(line); -- -2.25.1 +2.26.2 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 f175469ce4..64f1fc903c 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 8410be584674d595e9083950b84c74e5f880383b Mon Sep 17 00:00:00 2001 +From cd074864d450da544dd3b172fd8dbd9a4e2749c1 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 @@ -108,5 +108,5 @@ index 00d8ec81b..a7632c8f5 100644 @Override public HandlerList getHandlers() { -- -2.25.1 +2.26.2 diff --git a/Spigot-API-Patches/0166-Add-more-Zombie-API.patch b/Spigot-API-Patches/0166-Add-more-Zombie-API.patch index 4d8584e09b..ae371639c3 100644 --- a/Spigot-API-Patches/0166-Add-more-Zombie-API.patch +++ b/Spigot-API-Patches/0166-Add-more-Zombie-API.patch @@ -1,4 +1,4 @@ -From 418251eb02e5502ea67a1ec81d272732f910f2d9 Mon Sep 17 00:00:00 2001 +From 19f9dc15496d1efa08279e3a7ae100473028ee30 Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Sun, 7 Oct 2018 04:29:51 -0500 Subject: [PATCH] Add more Zombie API @@ -65,5 +65,5 @@ index 6dcac9798..fa7a43c35 100644 + // Paper end } -- -2.25.1 +2.26.2 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 a677bb5684..db6bcec2e6 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,4 +1,4 @@ -From df4eaab94f97ac58b44fa6d70ddf40446f3ebfda Mon Sep 17 00:00:00 2001 +From f54f0db8e7169371fbab9d7166eea9c2d43c18ce 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 @@ -33,5 +33,5 @@ index dce3d619a..7e2335ed8 100644 } -- -2.25.1 +2.26.2 diff --git a/Spigot-API-Patches/0168-Add-PlayerConnectionCloseEvent.patch b/Spigot-API-Patches/0168-Add-PlayerConnectionCloseEvent.patch index 8ffc48e0cc..2f24c6d33f 100644 --- a/Spigot-API-Patches/0168-Add-PlayerConnectionCloseEvent.patch +++ b/Spigot-API-Patches/0168-Add-PlayerConnectionCloseEvent.patch @@ -1,4 +1,4 @@ -From 7ecfaaa46164249d829fbeaf66cfe8cd701168bc Mon Sep 17 00:00:00 2001 +From f23d593720d88ce6108987504ed7b569e0fb8277 Mon Sep 17 00:00:00 2001 From: Spottedleaf Date: Sun, 7 Oct 2018 12:05:06 -0700 Subject: [PATCH] Add PlayerConnectionCloseEvent @@ -135,5 +135,5 @@ index 000000000..12c1c6fe9 + } +} -- -2.25.1 +2.26.2 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 32a01da5a8..2a2df3ba55 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 d9a50f9d02bba541df351e370d80503db47471d7 Mon Sep 17 00:00:00 2001 +From bec694b470d25f2085a404b980c98df2ba76a634 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 @@ -61,5 +61,5 @@ index 6cf05fed7..3afd5f5c0 100644 /** * Increments the given statistic for this player. -- -2.25.1 +2.26.2 diff --git a/Spigot-API-Patches/0170-BlockDestroyEvent.patch b/Spigot-API-Patches/0170-BlockDestroyEvent.patch index e08e35f902..dbca32d680 100644 --- a/Spigot-API-Patches/0170-BlockDestroyEvent.patch +++ b/Spigot-API-Patches/0170-BlockDestroyEvent.patch @@ -1,4 +1,4 @@ -From 9f28567e76a62262b1449dfd590d0d55846034ad Mon Sep 17 00:00:00 2001 +From 7bf842ef93db8eb174bdb610a2e0c796517746d4 Mon Sep 17 00:00:00 2001 From: Aikar Date: Wed, 6 Feb 2019 00:19:33 -0500 Subject: [PATCH] BlockDestroyEvent @@ -109,5 +109,5 @@ index 000000000..3aee12f1c + } +} -- -2.25.1 +2.26.2 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 d689cdf5a5..657fdb9240 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 8c9cf7b20c507df56649dbdcd0d1507aeaaab208 Mon Sep 17 00:00:00 2001 +From 6515b3feae9348d1e48113cc1c85ff1b04035465 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 @@ -69,5 +69,5 @@ index 84062dd71..ddcf84e66 100644 * Removes an ingredient from the list. * -- -2.25.1 +2.26.2 diff --git a/Spigot-API-Patches/0172-Add-WhitelistToggleEvent.patch b/Spigot-API-Patches/0172-Add-WhitelistToggleEvent.patch index c731f590ee..562fd44a8e 100644 --- a/Spigot-API-Patches/0172-Add-WhitelistToggleEvent.patch +++ b/Spigot-API-Patches/0172-Add-WhitelistToggleEvent.patch @@ -1,4 +1,4 @@ -From 623dbef48ed38122b70f6233bacac6eca3ce5d3a Mon Sep 17 00:00:00 2001 +From 1539f9c421ab42d9c3ba492a4e49fbdfe8db01f5 Mon Sep 17 00:00:00 2001 From: Mark Vainomaa Date: Wed, 13 Mar 2019 20:04:43 +0200 Subject: [PATCH] Add WhitelistToggleEvent @@ -51,5 +51,5 @@ index 000000000..fdd5eedb2 + } +} -- -2.25.1 +2.26.2 diff --git a/Spigot-API-Patches/0173-Annotation-Test-changes.patch b/Spigot-API-Patches/0173-Annotation-Test-changes.patch index e41c086e56..19a0220e26 100644 --- a/Spigot-API-Patches/0173-Annotation-Test-changes.patch +++ b/Spigot-API-Patches/0173-Annotation-Test-changes.patch @@ -1,4 +1,4 @@ -From dd6fd5a88bcd591f5bd770a575ca7ea9d745ac4e Mon Sep 17 00:00:00 2001 +From 350f623a98789a937e5298b592dbfe54af8b93b9 Mon Sep 17 00:00:00 2001 From: Shane Freeder Date: Sun, 17 Mar 2019 23:04:30 +0000 Subject: [PATCH] Annotation Test changes @@ -28,5 +28,5 @@ index 0c7377247..38be576b3 100644 @Test -- -2.25.1 +2.26.2 diff --git a/Spigot-API-Patches/0174-Entity-getEntitySpawnReason.patch b/Spigot-API-Patches/0174-Entity-getEntitySpawnReason.patch index 58a09489ab..05e0a4884d 100644 --- a/Spigot-API-Patches/0174-Entity-getEntitySpawnReason.patch +++ b/Spigot-API-Patches/0174-Entity-getEntitySpawnReason.patch @@ -1,4 +1,4 @@ -From edb98e617f2598261106ef474e0086a082f33422 Mon Sep 17 00:00:00 2001 +From 4ea7b62df345611789b4ea2507a2ba13fe1ca239 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 45e0dffe6..5518ecd21 100644 // Paper end } -- -2.25.1 +2.26.2 diff --git a/Spigot-API-Patches/0175-Add-GS4-Query-event.patch b/Spigot-API-Patches/0175-Add-GS4-Query-event.patch index 5114feaca7..5e6486046d 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 ea950c4c20b3979057656bc44eae306bbe176f42 Mon Sep 17 00:00:00 2001 +From bab6b94e2043244b38b9524d6956c460fecb79d9 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 @@ -423,5 +423,5 @@ index 000000000..77a19995f + } +} -- -2.25.1 +2.26.2 diff --git a/Spigot-API-Patches/0176-Add-PlayerPostRespawnEvent.patch b/Spigot-API-Patches/0176-Add-PlayerPostRespawnEvent.patch index 447872e481..3f0d5a3bae 100644 --- a/Spigot-API-Patches/0176-Add-PlayerPostRespawnEvent.patch +++ b/Spigot-API-Patches/0176-Add-PlayerPostRespawnEvent.patch @@ -1,4 +1,4 @@ -From a90ff87559e325bf8f1ccc43abf89a5206dfc4e1 Mon Sep 17 00:00:00 2001 +From 599500e51a5fd023124affa7212c4fd9d34ae2b6 Mon Sep 17 00:00:00 2001 From: MisterVector Date: Fri, 26 Oct 2018 21:33:13 -0700 Subject: [PATCH] Add PlayerPostRespawnEvent @@ -63,5 +63,5 @@ index 000000000..31f34b548 + } +} -- -2.25.1 +2.26.2 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 34aeb33b5b..5c9a151f5e 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 96c707d06d229797c278e27e906049cc374b5d6c Mon Sep 17 00:00:00 2001 +From 97522334c2889d82b4b13fbb754bbf3b7cd4f4e3 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 @@ -19,5 +19,5 @@ index 38be576b3..a48be38b1 100644 } -- -2.25.1 +2.26.2 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 96faafe7bf..2a5e2bf99b 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 107a95f0ecc9a61d25374493249ba6503c54dbd9 Mon Sep 17 00:00:00 2001 +From 796dabd7c6d4115be7c1af6434650c6dfbebfd4f 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 @@ -126,5 +126,5 @@ index 4940ba6a9..d7d6a3e83 100644 return this.meta == null ? Bukkit.getItemFactory().getItemMeta(this.type) : this.meta.clone(); } -- -2.25.1 +2.26.2 diff --git a/Spigot-API-Patches/0179-Server-Tick-Events.patch b/Spigot-API-Patches/0179-Server-Tick-Events.patch index 1da7eeaa87..e5f199ef9c 100644 --- a/Spigot-API-Patches/0179-Server-Tick-Events.patch +++ b/Spigot-API-Patches/0179-Server-Tick-Events.patch @@ -1,4 +1,4 @@ -From 55c0625f5bb4e6bd0014de4f5d573ab7f21c67b3 Mon Sep 17 00:00:00 2001 +From 1a22ffd8516da4b7847376075d625328f552b082 Mon Sep 17 00:00:00 2001 From: Aikar Date: Wed, 27 Mar 2019 21:58:55 -0400 Subject: [PATCH] Server Tick Events @@ -109,5 +109,5 @@ index 000000000..eac85f1f4 + } +} -- -2.25.1 +2.26.2 diff --git a/Spigot-API-Patches/0180-PlayerDeathEvent-getItemsToKeep.patch b/Spigot-API-Patches/0180-PlayerDeathEvent-getItemsToKeep.patch index 6bb672755d..a27ff551c7 100644 --- a/Spigot-API-Patches/0180-PlayerDeathEvent-getItemsToKeep.patch +++ b/Spigot-API-Patches/0180-PlayerDeathEvent-getItemsToKeep.patch @@ -1,4 +1,4 @@ -From ba8965617fb38e13d96b70788a7f0351f8665298 Mon Sep 17 00:00:00 2001 +From 37dc0a1dbb61d77c7b055ed6a0eb436c38f8f663 Mon Sep 17 00:00:00 2001 From: Aikar Date: Mon, 11 Mar 2013 20:04:34 -0400 Subject: [PATCH] PlayerDeathEvent#getItemsToKeep @@ -53,5 +53,5 @@ index 07a52441a..1e97d04b3 100644 this(player, drops, droppedExp, 0, deathMessage); } -- -2.25.1 +2.26.2 diff --git a/Spigot-API-Patches/0181-Add-Heightmap-API.patch b/Spigot-API-Patches/0181-Add-Heightmap-API.patch index 7c20778243..7e5f453af0 100644 --- a/Spigot-API-Patches/0181-Add-Heightmap-API.patch +++ b/Spigot-API-Patches/0181-Add-Heightmap-API.patch @@ -1,4 +1,4 @@ -From 358e052ad2b5e5e3cb119d36f8558332bb5cb1e7 Mon Sep 17 00:00:00 2001 +From 0aa76f1b76225ee5d226da8753034b42c84a61bb Mon Sep 17 00:00:00 2001 From: Spottedleaf Date: Sat, 1 Dec 2018 19:00:36 -0800 Subject: [PATCH] Add Heightmap API @@ -181,5 +181,5 @@ index c88f17244..db18f70ec 100644 * Gets the highest coordinate corresponding to the {@link HeightMap} at the * given coordinates. -- -2.25.1 +2.26.2 diff --git a/Spigot-API-Patches/0182-Mob-Spawner-API-Enhancements.patch b/Spigot-API-Patches/0182-Mob-Spawner-API-Enhancements.patch index 142b8b10e7..9169e001f8 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 f8f78c28755f27cccab9be2d2ba6000ee6016e2a Mon Sep 17 00:00:00 2001 +From 92e558aeeadc89ede03efc1ea18d6b93edac1673 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 cb447a4ad..35a599ebe 100644 + // Paper end } -- -2.25.1 +2.26.2 diff --git a/Spigot-API-Patches/0183-Add-BlockSoundGroup-interface.patch b/Spigot-API-Patches/0183-Add-BlockSoundGroup-interface.patch index e73e977baa..5c4e448d5c 100644 --- a/Spigot-API-Patches/0183-Add-BlockSoundGroup-interface.patch +++ b/Spigot-API-Patches/0183-Add-BlockSoundGroup-interface.patch @@ -1,4 +1,4 @@ -From 5b993133be600a04fc846882400213a82bec3f84 Mon Sep 17 00:00:00 2001 +From 28e560344d9b9e4904d6fbce0f7dcd658d445220 Mon Sep 17 00:00:00 2001 From: simpleauthority Date: Tue, 28 May 2019 03:41:28 -0700 Subject: [PATCH] Add BlockSoundGroup interface @@ -93,5 +93,5 @@ index 41f6b8491..971386795 100644 + // Paper end } -- -2.25.1 +2.26.2 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 d4207efdff..697d2a8413 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 c8ae0845a779a94befaec9e77421948b612a47fa Mon Sep 17 00:00:00 2001 +From a6b1af15d761c3ecbabed5a3543c0af41d1c9985 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 1075dbb81..3f24d302e 100644 public class PlayerInteractAtEntityEvent extends PlayerInteractEntityEvent { private static final HandlerList handlers = new HandlerList(); -- -2.25.1 +2.26.2 diff --git a/Spigot-API-Patches/0185-Make-PlayerEvent-public.patch b/Spigot-API-Patches/0185-Make-PlayerEvent-public.patch index b2c044a226..2b5f7ec4ce 100644 --- a/Spigot-API-Patches/0185-Make-PlayerEvent-public.patch +++ b/Spigot-API-Patches/0185-Make-PlayerEvent-public.patch @@ -1,11 +1,11 @@ -From beaf1e5982a99ee4acf2f2efe7cef56ac7610ed3 Mon Sep 17 00:00:00 2001 +From d5d4d306a2f31cfa9cf6ea388f1f353e6772acfb Mon Sep 17 00:00:00 2001 From: Aikar Date: Mon, 27 Apr 2020 02:40:34 -0400 Subject: [PATCH] Make PlayerEvent public diff --git a/src/main/java/org/bukkit/event/player/PlayerEvent.java b/src/main/java/org/bukkit/event/player/PlayerEvent.java -index 793b661b..b7c8f2c3 100644 +index 793b661b6..b7c8f2c31 100644 --- a/src/main/java/org/bukkit/event/player/PlayerEvent.java +++ b/src/main/java/org/bukkit/event/player/PlayerEvent.java @@ -14,7 +14,7 @@ public abstract class PlayerEvent extends Event { 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 4deceaeb94..de64ab4087 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 c936544e4c982dd62d8d17df2cee9e194963ba0b Mon Sep 17 00:00:00 2001 +From 2679ec7c429bf9919049fb57caf39d399dcfcb79 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 @@ -7,7 +7,7 @@ Doubles the custom payload size limit imposed by bukkit, also creates a system property to allow customizing the size `paper.maxCustomChannelName` diff --git a/src/main/java/org/bukkit/plugin/messaging/Messenger.java b/src/main/java/org/bukkit/plugin/messaging/Messenger.java -index 9d2c68c8..682c7718 100644 +index 9d2c68c82..682c77188 100644 --- a/src/main/java/org/bukkit/plugin/messaging/Messenger.java +++ b/src/main/java/org/bukkit/plugin/messaging/Messenger.java @@ -24,7 +24,7 @@ public interface Messenger { 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 40b1c70d97..eba6a01dd9 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 43f32b7a054b807b1157fd262e2e733e90a1feab Mon Sep 17 00:00:00 2001 +From ac5f14a8810ec5a3c17384e1587464a2afe2792a 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 df37b9ee5..80f9abdca 100644 // Paper end } -- -2.25.1 +2.26.2 diff --git a/Spigot-API-Patches/0188-PlayerDeathEvent-shouldDropExperience.patch b/Spigot-API-Patches/0188-PlayerDeathEvent-shouldDropExperience.patch index 32ff10341e..d4ed04e085 100644 --- a/Spigot-API-Patches/0188-PlayerDeathEvent-shouldDropExperience.patch +++ b/Spigot-API-Patches/0188-PlayerDeathEvent-shouldDropExperience.patch @@ -1,4 +1,4 @@ -From d235514ac508b4294b8f6d63fef1ade88f5dfa3e Mon Sep 17 00:00:00 2001 +From 7f0238c8822f58e59c5b1f515102d82827c8f015 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 1e97d04b3..3a743430a 100644 @NotNull -- -2.25.1 +2.26.2 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 d8e3bd38fb..fff82c7929 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 3d916db2d826ce09bda8aaef3dfe9fef5b67f2e6 Mon Sep 17 00:00:00 2001 +From 03b8a42e63003119c4d7edf60f35106ee3ea18e4 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 971386795..19a3b2a1f 100644 * Returns a list of items which would drop by destroying this block * -- -2.25.1 +2.26.2 diff --git a/Spigot-API-Patches/0190-Add-ThrownEggHatchEvent.patch b/Spigot-API-Patches/0190-Add-ThrownEggHatchEvent.patch index 8ec7fb4799..58426050f5 100644 --- a/Spigot-API-Patches/0190-Add-ThrownEggHatchEvent.patch +++ b/Spigot-API-Patches/0190-Add-ThrownEggHatchEvent.patch @@ -1,4 +1,4 @@ -From 846303604626907a77c402f34b60da5e1e19ace1 Mon Sep 17 00:00:00 2001 +From f9078b7ce594babfaea4ee77bb1a36073818ed60 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Sun, 9 Feb 2020 00:19:08 -0600 Subject: [PATCH] Add ThrownEggHatchEvent @@ -128,5 +128,5 @@ index 000000000..085d77dde + } +} -- -2.25.1 +2.26.2 diff --git a/Spigot-API-Patches/0191-Entity-Jump-API.patch b/Spigot-API-Patches/0191-Entity-Jump-API.patch index 3f722c97f8..6eca037698 100644 --- a/Spigot-API-Patches/0191-Entity-Jump-API.patch +++ b/Spigot-API-Patches/0191-Entity-Jump-API.patch @@ -1,4 +1,4 @@ -From 4f7f47c7b6de91c1101b33bf94e221cfc162b145 Mon Sep 17 00:00:00 2001 +From ffafa77c36486a1d9d4a989d09df94dd80a06355 Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Sat, 8 Feb 2020 23:26:18 -0600 Subject: [PATCH] Entity Jump API @@ -87,5 +87,5 @@ index deab50525..7f73e4b92 100644 // Paper end } -- -2.25.1 +2.26.2 diff --git a/Spigot-API-Patches/0192-add-hand-to-BlockMultiPlaceEvent.patch b/Spigot-API-Patches/0192-add-hand-to-BlockMultiPlaceEvent.patch index f09092dc0f..f775e2a165 100644 --- a/Spigot-API-Patches/0192-add-hand-to-BlockMultiPlaceEvent.patch +++ b/Spigot-API-Patches/0192-add-hand-to-BlockMultiPlaceEvent.patch @@ -1,4 +1,4 @@ -From 4491e720453f87bffe6259822f7e23b07d708cb4 Mon Sep 17 00:00:00 2001 +From 3c38ffde416c5cee46f869755a7280c58dec8ce6 Mon Sep 17 00:00:00 2001 From: Trigary Date: Sun, 1 Mar 2020 22:43:34 +0100 Subject: [PATCH] add hand to BlockMultiPlaceEvent @@ -28,5 +28,5 @@ index fe2ec79dd..8460aa4f5 100644 /** -- -2.25.1 +2.26.2 diff --git a/Spigot-API-Patches/0193-Add-tick-times-API.patch b/Spigot-API-Patches/0193-Add-tick-times-API.patch index 33617af891..551085e8cc 100644 --- a/Spigot-API-Patches/0193-Add-tick-times-API.patch +++ b/Spigot-API-Patches/0193-Add-tick-times-API.patch @@ -1,11 +1,11 @@ -From 1fe29f877ba04e8bed08b47c185ddb9244705507 Mon Sep 17 00:00:00 2001 +From e0a523e39dc4d572fe3697e03697443a3caa7bf9 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Sun, 5 Apr 2020 22:22:58 -0500 Subject: [PATCH] Add tick times API diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java -index b9973406..c3c2d9c6 100644 +index b99734068..c3c2d9c6b 100644 --- a/src/main/java/org/bukkit/Bukkit.java +++ b/src/main/java/org/bukkit/Bukkit.java @@ -1412,6 +1412,25 @@ public final class Bukkit { @@ -35,7 +35,7 @@ index b9973406..c3c2d9c6 100644 /** diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java -index 80f9abdc..bfa83c9b 100644 +index 80f9abdca..bfa83c9bb 100644 --- a/src/main/java/org/bukkit/Server.java +++ b/src/main/java/org/bukkit/Server.java @@ -1188,6 +1188,21 @@ public interface Server extends PluginMessageRecipient { @@ -61,5 +61,5 @@ index 80f9abdc..bfa83c9b 100644 // Paper start -- -2.24.0 +2.26.2 diff --git a/Spigot-API-Patches/0194-Expose-MinecraftServer-isRunning.patch b/Spigot-API-Patches/0194-Expose-MinecraftServer-isRunning.patch index 7f75d592ad..40806dd1ff 100644 --- a/Spigot-API-Patches/0194-Expose-MinecraftServer-isRunning.patch +++ b/Spigot-API-Patches/0194-Expose-MinecraftServer-isRunning.patch @@ -1,4 +1,4 @@ -From a5bc4ab211dd7d61537cf330e7092ec28ba18733 Mon Sep 17 00:00:00 2001 +From 165e8827e1cd5f52e5bed17d42f8ab2fbe99450d Mon Sep 17 00:00:00 2001 From: JRoy Date: Fri, 10 Apr 2020 21:24:35 -0400 Subject: [PATCH] Expose MinecraftServer#isRunning @@ -43,5 +43,5 @@ index bfa83c9bb..9ceaac0e8 100644 // Paper end } -- -2.25.1 +2.26.2 diff --git a/Spigot-API-Patches/0195-Disable-Sync-Events-firing-Async-errors-during-shutd.patch b/Spigot-API-Patches/0195-Disable-Sync-Events-firing-Async-errors-during-shutd.patch index b3c69fcd8a..ca01a0455c 100644 --- a/Spigot-API-Patches/0195-Disable-Sync-Events-firing-Async-errors-during-shutd.patch +++ b/Spigot-API-Patches/0195-Disable-Sync-Events-firing-Async-errors-during-shutd.patch @@ -1,4 +1,4 @@ -From 1e9550b8715340fa26b9de6bf6c1b0fee593b885 Mon Sep 17 00:00:00 2001 +From ea40fdf45bb3c6b1130177862a7496efaae08a24 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sat, 11 Apr 2020 21:38:59 -0400 Subject: [PATCH] Disable Sync Events firing Async errors during shutdown @@ -24,5 +24,5 @@ index 8355f9f0e..4931bc86d 100644 } -- -2.25.1 +2.26.2 diff --git a/Spigot-API-Patches/0196-Make-JavaPluginLoader-thread-safe.patch b/Spigot-API-Patches/0196-Make-JavaPluginLoader-thread-safe.patch index 61f47853ac..4a9c008528 100644 --- a/Spigot-API-Patches/0196-Make-JavaPluginLoader-thread-safe.patch +++ b/Spigot-API-Patches/0196-Make-JavaPluginLoader-thread-safe.patch @@ -1,11 +1,11 @@ -From 8ee6c03819b3128a206f5a5a73002bd719baf25b Mon Sep 17 00:00:00 2001 +From 49584133dc28884b641698f3b8996b0b1d60642c Mon Sep 17 00:00:00 2001 From: Trigary Date: Wed, 15 Apr 2020 01:24:55 -0400 Subject: [PATCH] Make JavaPluginLoader thread-safe diff --git a/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java b/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java -index 8ff228ce..ba2c5c6e 100644 +index 8ff228ced..ba2c5c6ee 100644 --- a/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java +++ b/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java @@ -52,6 +52,8 @@ public final class JavaPluginLoader implements PluginLoader { @@ -58,5 +58,5 @@ index 8ff228ce..ba2c5c6e 100644 } -- -2.25.1 +2.26.2 diff --git a/Spigot-API-Patches/0197-Add-Player-Client-Options-API.patch b/Spigot-API-Patches/0197-Add-Player-Client-Options-API.patch index 5b98894115..42219f310e 100644 --- a/Spigot-API-Patches/0197-Add-Player-Client-Options-API.patch +++ b/Spigot-API-Patches/0197-Add-Player-Client-Options-API.patch @@ -1,4 +1,4 @@ -From fae45f9c98f07be9e341c9a04d47d885d5b503c7 Mon Sep 17 00:00:00 2001 +From c267ad45f2e7a1768db628032a10c17b2e301fb4 Mon Sep 17 00:00:00 2001 From: MiniDigger Date: Mon, 20 Jan 2020 21:38:34 +0100 Subject: [PATCH] Add Player Client Options API @@ -6,7 +6,7 @@ Subject: [PATCH] Add Player Client Options API diff --git a/src/main/java/com/destroystokyo/paper/ClientOption.java b/src/main/java/com/destroystokyo/paper/ClientOption.java new file mode 100644 -index 00000000..9dad814c +index 000000000..9dad814cf --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/ClientOption.java @@ -0,0 +1,33 @@ @@ -45,7 +45,7 @@ index 00000000..9dad814c +} diff --git a/src/main/java/com/destroystokyo/paper/SkinParts.java b/src/main/java/com/destroystokyo/paper/SkinParts.java new file mode 100644 -index 00000000..4a0c3940 +index 000000000..4a0c39405 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/SkinParts.java @@ -0,0 +1,20 @@ @@ -71,7 +71,7 @@ index 00000000..4a0c3940 +} diff --git a/src/main/java/com/destroystokyo/paper/event/player/PlayerClientOptionsChangeEvent.java b/src/main/java/com/destroystokyo/paper/event/player/PlayerClientOptionsChangeEvent.java new file mode 100644 -index 00000000..f7f171c4 +index 000000000..f7f171c4e --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/event/player/PlayerClientOptionsChangeEvent.java @@ -0,0 +1,100 @@ @@ -176,7 +176,7 @@ index 00000000..f7f171c4 + } +} diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java -index 3600b4c8..787bb144 100644 +index 3600b4c84..787bb144b 100644 --- a/src/main/java/org/bukkit/entity/Player.java +++ b/src/main/java/org/bukkit/entity/Player.java @@ -1,6 +1,7 @@ @@ -201,5 +201,5 @@ index 3600b4c8..787bb144 100644 // Spigot start -- -2.25.1 +2.26.2 diff --git a/Spigot-API-Patches/0198-Add-PlayerAttackEntityCooldownResetEvent.patch b/Spigot-API-Patches/0198-Add-PlayerAttackEntityCooldownResetEvent.patch index db614c85f8..a1f18e46a4 100644 --- a/Spigot-API-Patches/0198-Add-PlayerAttackEntityCooldownResetEvent.patch +++ b/Spigot-API-Patches/0198-Add-PlayerAttackEntityCooldownResetEvent.patch @@ -1,4 +1,4 @@ -From e38b34700c710bf372ce83acfb7a0aeaa54bc7d0 Mon Sep 17 00:00:00 2001 +From 638eb076a921e969094b88f36daa251f2eb47ed7 Mon Sep 17 00:00:00 2001 From: nossr50 Date: Thu, 26 Mar 2020 19:30:58 -0700 Subject: [PATCH] Add PlayerAttackEntityCooldownResetEvent @@ -6,7 +6,7 @@ Subject: [PATCH] Add PlayerAttackEntityCooldownResetEvent diff --git a/src/main/java/com/destroystokyo/paper/event/player/PlayerAttackEntityCooldownResetEvent.java b/src/main/java/com/destroystokyo/paper/event/player/PlayerAttackEntityCooldownResetEvent.java new file mode 100644 -index 00000000..ebdebe7b +index 000000000..ebdebe7b6 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/event/player/PlayerAttackEntityCooldownResetEvent.java @@ -0,0 +1,76 @@ @@ -87,5 +87,5 @@ index 00000000..ebdebe7b + } +} -- -2.25.1 +2.26.2 diff --git a/Spigot-API-Patches/0199-Fix-Potion-toItemStack-swapping-the-extended-and-upg.patch b/Spigot-API-Patches/0199-Fix-Potion-toItemStack-swapping-the-extended-and-upg.patch index cb7111e11e..5777b9bc97 100644 --- a/Spigot-API-Patches/0199-Fix-Potion-toItemStack-swapping-the-extended-and-upg.patch +++ b/Spigot-API-Patches/0199-Fix-Potion-toItemStack-swapping-the-extended-and-upg.patch @@ -1,4 +1,4 @@ -From d3956af4031ab5e1a451429c49d6923bcf932bf7 Mon Sep 17 00:00:00 2001 +From 920ba75d50b484e75fb3b746365ecc476135ca5b Mon Sep 17 00:00:00 2001 From: Wesley Smith Date: Fri, 24 Apr 2020 18:30:26 -0400 Subject: [PATCH] Fix Potion#toItemStack swapping the extended and upgraded @@ -7,7 +7,7 @@ Subject: [PATCH] Fix Potion#toItemStack swapping the extended and upgraded While the Potion class is deprecated, it is still used in some plugins for cross-version potion handling. This issue has existed for a long time, and has caused many heaches along the way. diff --git a/src/main/java/org/bukkit/potion/Potion.java b/src/main/java/org/bukkit/potion/Potion.java -index b9dbbfd0..ac02ae4f 100644 +index b9dbbfd07..ac02ae4fc 100644 --- a/src/main/java/org/bukkit/potion/Potion.java +++ b/src/main/java/org/bukkit/potion/Potion.java @@ -267,7 +267,7 @@ public class Potion { @@ -20,5 +20,5 @@ index b9dbbfd0..ac02ae4f 100644 return itemStack; } -- -2.21.0 (Apple Git-122) +2.26.2 diff --git a/Spigot-API-Patches/0200-Villager-Restocks-API.patch b/Spigot-API-Patches/0200-Villager-Restocks-API.patch index 5409032b55..566f6fed1e 100644 --- a/Spigot-API-Patches/0200-Villager-Restocks-API.patch +++ b/Spigot-API-Patches/0200-Villager-Restocks-API.patch @@ -1,11 +1,11 @@ -From 81d3a61bd89a1671f901041a4eb7673a28231729 Mon Sep 17 00:00:00 2001 +From 06142d327789e096f5fabec10ddf2667a892c094 Mon Sep 17 00:00:00 2001 From: zbk Date: Sun, 26 Apr 2020 23:49:03 -0400 Subject: [PATCH] Villager Restocks API diff --git a/src/main/java/org/bukkit/entity/Villager.java b/src/main/java/org/bukkit/entity/Villager.java -index ef48ad9b..d1579153 100644 +index ef48ad9b2..d15791530 100644 --- a/src/main/java/org/bukkit/entity/Villager.java +++ b/src/main/java/org/bukkit/entity/Villager.java @@ -77,6 +77,20 @@ public interface Villager extends AbstractVillager { @@ -30,5 +30,5 @@ index ef48ad9b..d1579153 100644 * Attempts to make this villager sleep at the given location. *
-- -2.25.0.windows.1 +2.26.2 diff --git a/Spigot-Server-Patches/0001-POM-Changes.patch b/Spigot-Server-Patches/0001-POM-Changes.patch index f9dc6e8d68..c82c38885d 100644 --- a/Spigot-Server-Patches/0001-POM-Changes.patch +++ b/Spigot-Server-Patches/0001-POM-Changes.patch @@ -1,4 +1,4 @@ -From b00609242621c3d19cfd2d442f196474f97509f4 Mon Sep 17 00:00:00 2001 +From e25efa93c402502049e6ccd531118f65a856d1a9 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/Spigot-Server-Patches/0002-Paper-config-files.patch b/Spigot-Server-Patches/0002-Paper-config-files.patch index ef2aec33e9..249893ff20 100644 --- a/Spigot-Server-Patches/0002-Paper-config-files.patch +++ b/Spigot-Server-Patches/0002-Paper-config-files.patch @@ -1,4 +1,4 @@ -From cddfa4ac80d6d4cdf01a1bea0bda766e30caa8c0 Mon Sep 17 00:00:00 2001 +From 5f389e556ca6d0afbc7597f67572a543b79c23e7 Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Mon, 29 Feb 2016 21:02:09 -0600 Subject: [PATCH] Paper config files @@ -574,7 +574,7 @@ index 136d1b50f1..9eed98e379 100644 this.setSpawnAnimals(dedicatedserverproperties.spawnAnimals); this.setSpawnNPCs(dedicatedserverproperties.spawnNpcs); diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java -index 4b90ee6ef5..8789191fe6 100644 +index 9fddbae24c..f4863852b0 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 { @@ -591,7 +591,7 @@ index 4b90ee6ef5..8789191fe6 100644 public long aa; public long ab; diff --git a/src/main/java/net/minecraft/server/EntityTypes.java b/src/main/java/net/minecraft/server/EntityTypes.java -index ddca89a132..f937b72945 100644 +index 158cc1beb2..29e776ca19 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; @@ -614,7 +614,7 @@ index ddca89a132..f937b72945 100644 + // Paper end } diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index 487346ce8c..177e2af68d 100644 +index ad43b48073..2e1eabba14 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -70,6 +70,8 @@ public abstract class World implements GeneratorAccess, AutoCloseable { @@ -635,7 +635,7 @@ index 487346ce8c..177e2af68d 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 02364e3c32..8d1f066f00 100644 +index be30f6bf6a..ad1dcf5304 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -769,6 +769,7 @@ public final class CraftServer implements Server { @@ -699,7 +699,7 @@ index 02364e3c32..8d1f066f00 100644 + // Paper end } diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java -index 7d9a1851d7..0d8668d34d 100644 +index cb5d0f5378..101d5b42e3 100644 --- a/src/main/java/org/bukkit/craftbukkit/Main.java +++ b/src/main/java/org/bukkit/craftbukkit/Main.java @@ -129,6 +129,14 @@ public class Main { @@ -718,7 +718,7 @@ index 7d9a1851d7..0d8668d34d 100644 }; diff --git a/src/main/java/org/spigotmc/SpigotWorldConfig.java b/src/main/java/org/spigotmc/SpigotWorldConfig.java -index 5597d41005..4965a48c30 100644 +index 5fdc9bc711..3cd66886cd 100644 --- a/src/main/java/org/spigotmc/SpigotWorldConfig.java +++ b/src/main/java/org/spigotmc/SpigotWorldConfig.java @@ -39,36 +39,36 @@ public class SpigotWorldConfig @@ -765,5 +765,5 @@ index 5597d41005..4965a48c30 100644 config.addDefault( "world-settings.default." + path, def ); return config.getString( "world-settings." + worldName + "." + path, config.getString( "world-settings.default." + path ) ); -- -2.25.1 +2.26.2 diff --git a/Spigot-Server-Patches/0003-MC-Dev-fixes.patch b/Spigot-Server-Patches/0003-MC-Dev-fixes.patch index 0300089535..58a4dd7a02 100644 --- a/Spigot-Server-Patches/0003-MC-Dev-fixes.patch +++ b/Spigot-Server-Patches/0003-MC-Dev-fixes.patch @@ -1,4 +1,4 @@ -From b842654dba6b06d20f645ab009557566a67eca88 Mon Sep 17 00:00:00 2001 +From 13cf3392bb2bc04fc35a486b7ab5e3a982bd72cc Mon Sep 17 00:00:00 2001 From: Aikar Date: Wed, 30 Mar 2016 19:36:20 -0400 Subject: [PATCH] MC Dev fixes @@ -713,5 +713,5 @@ index 55fe7625af..19e68a7831 100644 t0.a(nbttagcompound.getCompound("data")); -- -2.25.1 +2.26.2 diff --git a/Spigot-Server-Patches/0004-MC-Utils.patch b/Spigot-Server-Patches/0004-MC-Utils.patch index 96694ab449..1c007766c1 100644 --- a/Spigot-Server-Patches/0004-MC-Utils.patch +++ b/Spigot-Server-Patches/0004-MC-Utils.patch @@ -1,4 +1,4 @@ -From a3cb7f33acca0c854544f6d17d0e9407b1cd418e Mon Sep 17 00:00:00 2001 +From b2436021374f61062a581239cc1a3500edd54bb4 Mon Sep 17 00:00:00 2001 From: Aikar Date: Mon, 28 Mar 2016 20:55:47 -0400 Subject: [PATCH] MC Utils @@ -2786,7 +2786,7 @@ index bdfb173853..0b06fa2b66 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 3b1bcf3495..1f350e3352 100644 +index 9d1adaaa2c..3ace8ee854 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 { @@ -2810,7 +2810,7 @@ index 00c3b666d7..e5322fbae5 100644 super(entitytypes, world); this.f = 5; diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java -index ce48210922..57ce9bde64 100644 +index 541ddc928b..26e32aa1db 100644 --- a/src/main/java/net/minecraft/server/EntityPlayer.java +++ b/src/main/java/net/minecraft/server/EntityPlayer.java @@ -87,6 +87,8 @@ public class EntityPlayer extends EntityHuman implements ICrafting { @@ -4034,5 +4034,5 @@ index 1aec70a1f1..f72c13beda 100644 private int initialCapacity; -- -2.25.1 +2.26.2 diff --git a/Spigot-Server-Patches/0005-Paper-Metrics.patch b/Spigot-Server-Patches/0005-Paper-Metrics.patch index 9457ffac27..773830c5e0 100644 --- a/Spigot-Server-Patches/0005-Paper-Metrics.patch +++ b/Spigot-Server-Patches/0005-Paper-Metrics.patch @@ -1,4 +1,4 @@ -From e8c6717019fe0c867ff3393920b199bc2d3e2775 Mon Sep 17 00:00:00 2001 +From 760b0e1fc3bceb0363fa0c68ead4bff009ea1a01 Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Fri, 24 Mar 2017 23:56:01 -0500 Subject: [PATCH] Paper Metrics @@ -691,5 +691,5 @@ index ff1ddfcfe0..fdca34346a 100644 static void readConfig(Class clazz, Object instance) -- -2.25.1 +2.26.2 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 c7ab908794..6f4d1b45aa 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 f7532f84ba9e383d53cbca1ea5cedafc603e131f Mon Sep 17 00:00:00 2001 +From d7e09e8c54402420bebf78ed377f8edb9b66c4e3 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 41c79650b1..b839769cea 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 8789191fe6..7899fd6d88 100644 +index f4863852b0..38227d85f4 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 8789191fe6..7899fd6d88 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 cbf0c2f25d..79f8549660 100644 +index 4328273b1f..8427ee2ee8 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 40752f7617..9071bb7ece 100644 public World getWorld() { return this.world; -- -2.25.1 +2.26.2 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 5df521a68b..fc8a2a5d0d 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 21423d201b654a7fb6843f94f98c659d9c1bdb54 Mon Sep 17 00:00:00 2001 +From 501904519947a10ca310e0db3b92828950e3a027 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 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 66ba662fe5..b4e27052ba 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 0943d0da18af92bd7cb5fe9c9143f01d2d282b30 Mon Sep 17 00:00:00 2001 +From ecf43fc4577369da779f08aa2b5c9a3ba2a248cb 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 @@ -6,7 +6,7 @@ Subject: [PATCH] Store counts for each Entity/Block Entity Type Opens door for future patches to optimize performance diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java -index 061384b01..2b6fe2e01 100644 +index 061384b012..2b6fe2e01d 100644 --- a/src/main/java/net/minecraft/server/Chunk.java +++ b/src/main/java/net/minecraft/server/Chunk.java @@ -56,15 +56,19 @@ public class Chunk implements IChunkAccess { @@ -54,5 +54,5 @@ index 061384b01..2b6fe2e01 100644 this.entities.remove(entity); // Paper } -- -2.26.0 +2.26.2 diff --git a/Spigot-Server-Patches/0009-Timings-v2.patch b/Spigot-Server-Patches/0009-Timings-v2.patch index 9097ad16fb..b81d1267c7 100644 --- a/Spigot-Server-Patches/0009-Timings-v2.patch +++ b/Spigot-Server-Patches/0009-Timings-v2.patch @@ -1,4 +1,4 @@ -From 32305966c8db9a70681fd5f858d6e738cab1e48b Mon Sep 17 00:00:00 2001 +From f0fe55e3dd96e50f2eb4a56ca5a601d8e0c89a6a Mon Sep 17 00:00:00 2001 From: Aikar Date: Thu, 3 Mar 2016 04:00:11 -0600 Subject: [PATCH] Timings v2 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 38c22f3682..afaa2b005b 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 4b9d15b9bd6a74705231f2646a99cf8bedb30fc6 Mon Sep 17 00:00:00 2001 +From 51f78214ad1aa4e496b31fc1f4e99ac5d0c26f01 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 2106b0b49f..55b07444e1 100644 if (j >= (byte) range(3, ((100.0F / worldserver.spigotConfig.caneModifier) * 15) + 0.5F, 15)) { // Spigot -- -2.25.1 +2.26.2 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 af33b67a86..3eb22f2603 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 c71eb474e0735aac8eea843c10613e160978410b Mon Sep 17 00:00:00 2001 +From 0a0e608e9cc522e573ee12fff0ef88922238642c 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 @@ -50,5 +50,5 @@ index 7783b57912..0240cef74a 100644 } -- -2.25.1 +2.26.2 diff --git a/Spigot-Server-Patches/0012-Configurable-fishing-time-ranges.patch b/Spigot-Server-Patches/0012-Configurable-fishing-time-ranges.patch index a8226488d9..04c67bf763 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 e56625227f320006b3dcfb16fd44c2a771df9410 Mon Sep 17 00:00:00 2001 +From c999b51b488b1a969d3bca8df0e6ee3129a3c044 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 7be189f742..40bdcf4e75 100644 } -- -2.25.1 +2.26.2 diff --git a/Spigot-Server-Patches/0013-Allow-nerfed-mobs-to-jump-and-take-water-damage.patch b/Spigot-Server-Patches/0013-Allow-nerfed-mobs-to-jump-and-take-water-damage.patch index fcedbcdc8c..db123ba058 100644 --- a/Spigot-Server-Patches/0013-Allow-nerfed-mobs-to-jump-and-take-water-damage.patch +++ b/Spigot-Server-Patches/0013-Allow-nerfed-mobs-to-jump-and-take-water-damage.patch @@ -1,4 +1,4 @@ -From 42a58e4d6628de5ed09c9226c0a2cdbaf4a05fa3 Mon Sep 17 00:00:00 2001 +From 2db9760a6c3eaf9c8129af28e115f5b9e3d914a5 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 and take water damage @@ -31,7 +31,7 @@ index 2e869004c8..8a6856e0fd 100644 this.b.setJumping(this.a); this.a = false; diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java -index e9d0a4eb90..957330b673 100644 +index c75b74d558..23497aa934 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java @@ -1103,6 +1103,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke @@ -112,5 +112,5 @@ index 0f0dc7277f..43908b0400 100644 public void e() { if (this.a.getRandom().nextFloat() < 0.8F) { -- -2.25.1 +2.26.2 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 3a8b0638e3..a21772e42b 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 d3e96c985d55b45be92fac75363155ca1c981bb9 Mon Sep 17 00:00:00 2001 +From 8112879d97a26b6dc2c5c07cf5ac527c4bd566ff 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 @@ -48,5 +48,5 @@ index 70cd0801dc..23995b68a1 100644 } else if (d0 < 1024.0D) { this.ticksFarFromPlayer = 0; -- -2.25.1 +2.26.2 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 b4c738ecaa..191b16ef0e 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 a2a83ec2afba1860b85959162f1b3c0b5af44ad7 Mon Sep 17 00:00:00 2001 +From 50e14d6c5ba9f7484b197136b0e09d39f15ba969 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 2845686411..8ee2b9bb1b 100644 + } } diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index 132c08dd19..7d668759fc 100644 +index f572c5f227..0332aca8be 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -141,6 +141,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable { @@ -32,5 +32,5 @@ index 132c08dd19..7d668759fc 100644 this.tileLimiter = new org.spigotmc.TickLimiter(spigotConfig.tileMaxTickTime); } -- -2.25.1 +2.26.2 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 b3f76b01b2..ebf26fee5e 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 3046e2bc8ac417f59ec00f31522e408c5868ea69 Mon Sep 17 00:00:00 2001 +From ad87983cdd6c3b9fcd615e75b23dca3290404587 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 8ee2b9bb1b..d59b82b7bb 100644 + } } diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java -index 957330b673..7d4badd974 100644 +index 23497aa934..9647d7850c 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java @@ -1818,6 +1818,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke @@ -75,5 +75,5 @@ index d042124362..d9fd4448c7 100644 if (this.onGround) { this.setMot(this.getMot().d(0.7D, -0.5D, 0.7D)); -- -2.25.1 +2.26.2 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 b7f31628f7..217bbdea39 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 498392154e1462cfd2d92bbc7f2c56ba23fc8972 Mon Sep 17 00:00:00 2001 +From 746bf932691839f8e2c1fd8a5b4167abbe552faa 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 @@ -45,7 +45,7 @@ index 1ceba5f7ea..ee74986373 100644 private final String bukkitVersion = Versioning.getBukkitVersion(); private final Logger logger = Logger.getLogger("Minecraft"); diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java -index b77593b51a..9806d77347 100644 +index 101d5b42e3..1ee4050609 100644 --- a/src/main/java/org/bukkit/craftbukkit/Main.java +++ b/src/main/java/org/bukkit/craftbukkit/Main.java @@ -200,12 +200,25 @@ public class Main { diff --git a/Spigot-Server-Patches/0018-Implement-Paper-VersionChecker.patch b/Spigot-Server-Patches/0018-Implement-Paper-VersionChecker.patch index 634266d8eb..d6affc0123 100644 --- a/Spigot-Server-Patches/0018-Implement-Paper-VersionChecker.patch +++ b/Spigot-Server-Patches/0018-Implement-Paper-VersionChecker.patch @@ -1,4 +1,4 @@ -From f826e74ec3272254812060e29292250982c97422 Mon Sep 17 00:00:00 2001 +From f22720e4217607abcb9c847b073a44c5c4628f5f Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Mon, 27 May 2019 03:40:05 -0500 Subject: [PATCH] Implement Paper VersionChecker @@ -142,5 +142,5 @@ index 02f3300533..b1e1b59d45 100644 /** -- -2.25.1 +2.26.2 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 252c0ff0ea..d06b82e369 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,4 +1,4 @@ -From 477ed65e869034181a365e5182ab2a1286f9bf70 Mon Sep 17 00:00:00 2001 +From 8fbf689ae7f4d4025dafa432323bc5bcffbac07a 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 @@ -204,5 +204,5 @@ index d6646d7e61..4b1f8c5373 100644 this.setSpawnAnimals(dedicatedserverproperties.spawnAnimals); -- -2.25.1 +2.26.2 diff --git a/Spigot-Server-Patches/0020-Player-affects-spawning-API.patch b/Spigot-Server-Patches/0020-Player-affects-spawning-API.patch index e7462622a0..b2e7e1b361 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 8ec886dde0916ea3b979b33030a9c11c152061f4 Mon Sep 17 00:00:00 2001 +From 29f1c96dafc276ffc026652f562e716cf2224873 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 242129ae42..26adb55409 100644 +index 1228b73bd4..1f20fbbf92 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 { @@ -45,7 +45,7 @@ index 102b3a3c48..08c2a22f7a 100644 return false; } diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index d7a4e50f23..ae2c1b97ad 100644 +index ba6a924a9c..e40a379905 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -1626,7 +1626,19 @@ public class CraftPlayer extends CraftHumanEntity implements Player { @@ -69,5 +69,5 @@ index d7a4e50f23..ae2c1b97ad 100644 @Override public void updateCommands() { -- -2.25.1 +2.26.2 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 bd7ad993d9..65b021d852 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,11 +1,11 @@ -From c91df8ae2fc7a6a054370eb8fef42fbb4d65333d Mon Sep 17 00:00:00 2001 +From 7d9ffa2cd54f434e0c356777203796fb62c3a137 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 diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java -index 87c5e09a5..14097d40d 100644 +index 4cd353b253..56d740fcad 100644 --- a/src/main/java/net/minecraft/server/Chunk.java +++ b/src/main/java/net/minecraft/server/Chunk.java @@ -590,6 +590,10 @@ public class Chunk implements IChunkAccess { @@ -20,5 +20,5 @@ index 87c5e09a5..14097d40d 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.26.0 +2.26.2 diff --git a/Spigot-Server-Patches/0022-Optimize-TileEntity-Ticking.patch b/Spigot-Server-Patches/0022-Optimize-TileEntity-Ticking.patch index 43f6d85bc9..efffe5a388 100644 --- a/Spigot-Server-Patches/0022-Optimize-TileEntity-Ticking.patch +++ b/Spigot-Server-Patches/0022-Optimize-TileEntity-Ticking.patch @@ -1,4 +1,4 @@ -From cb3baf5923937f6c9837ccbdb75bf1127b1b9c17 Mon Sep 17 00:00:00 2001 +From 2636209798e4b7c25812b1281446bd801c5b7d64 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 68737be5e6..17c39edca0 100644 public boolean a(EntityHuman entityhuman) { -- -2.25.1 +2.26.2 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 1064ed7377..dfdc66b626 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 f8b2b0e30d6bfb90e265a6d91ee8b96729761fda Mon Sep 17 00:00:00 2001 +From b73bfd83c5a8235791061bb14f75cde36101cf40 Mon Sep 17 00:00:00 2001 From: Aikar Date: Tue, 1 Mar 2016 23:09:29 -0600 Subject: [PATCH] Further improve server tick loop @@ -140,7 +140,7 @@ index e71ee0fb33..53d0a98d00 100644 if (this.T) { this.T = false; diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 99a6b3d443..e3939387e7 100644 +index ee74986373..99083a1f36 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -1970,6 +1970,17 @@ public final class CraftServer implements Server { 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 f774edcb02..89669b6535 100644 --- a/Spigot-Server-Patches/0024-Only-refresh-abilities-if-needed.patch +++ b/Spigot-Server-Patches/0024-Only-refresh-abilities-if-needed.patch @@ -1,11 +1,11 @@ -From de5359c1296d1a46a5083271f87d5f6771c3c1a3 Mon Sep 17 00:00:00 2001 +From 6c4de90b4c2f1d43f938864f88f9da0d964b382a 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 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index ae2c1b97ad..b3c8343239 100644 +index e40a379905..331555dc27 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -1315,12 +1315,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player { @@ -24,5 +24,5 @@ index ae2c1b97ad..b3c8343239 100644 @Override -- -2.25.1 +2.26.2 diff --git a/Spigot-Server-Patches/0025-Entity-Origin-API.patch b/Spigot-Server-Patches/0025-Entity-Origin-API.patch index 6c32dd81fa..a23c854d61 100644 --- a/Spigot-Server-Patches/0025-Entity-Origin-API.patch +++ b/Spigot-Server-Patches/0025-Entity-Origin-API.patch @@ -1,4 +1,4 @@ -From e52dfa5c34f0bc566133f8fcca7710103344caf6 Mon Sep 17 00:00:00 2001 +From d02bc60a955773b5851092ecfc25439317cc4fdb 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/Spigot-Server-Patches/0026-Prevent-tile-entity-and-entity-crashes.patch b/Spigot-Server-Patches/0026-Prevent-tile-entity-and-entity-crashes.patch index 004b4f58a2..08d567c98c 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 db87fa015dcaeff971e40d0a2084b6ee1337afba Mon Sep 17 00:00:00 2001 +From 7b3e2a5ab6667fe4ad3a400cbaaa9fa9803fea3d 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 @@ -64,5 +64,5 @@ index 0332aca8be..1bb3620154 100644 } -- -2.25.1 +2.26.2 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 41fd3ddc0b..cdca4e6b19 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 1ee3c8ba2a898176de4110c023ed06b02dbffe1e Mon Sep 17 00:00:00 2001 +From 493eb4bf539ee63f18a72add87ca6a1a0ca6aaff 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 d59b82b7bb..f7a0a33e49 100644 + } } diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java -index 18236504e4..826202f437 100644 +index cf4901ccae..5e3959901b 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java @@ -406,9 +406,16 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke @@ -96,5 +96,5 @@ index e4d1f37f9f..c2843d5d60 100644 // this.doPortalTick(); // CraftBukkit - handled in postTick if (this.world.isClientSide) { -- -2.25.1 +2.26.2 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 5b1cc3b06a..57e9fb3eea 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,4 +1,4 @@ -From 1afa27377464445772cddb3095fa446755b7a5d4 Mon Sep 17 00:00:00 2001 +From 0c54a8c74d21959e27efaa3de62113fa12e5e551 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 @@ -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.25.1 +2.26.2 diff --git a/Spigot-Server-Patches/0029-Always-tick-falling-blocks.patch b/Spigot-Server-Patches/0029-Always-tick-falling-blocks.patch index 20599c6bfb..daf2c8212b 100644 --- a/Spigot-Server-Patches/0029-Always-tick-falling-blocks.patch +++ b/Spigot-Server-Patches/0029-Always-tick-falling-blocks.patch @@ -1,4 +1,4 @@ -From b51a9f6a415c93d11b5bc7110b38250708a5e372 Mon Sep 17 00:00:00 2001 +From 46ec2964d532d3db70c6e89531bdbf3b05cf5979 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 @@ -25,5 +25,5 @@ index 4423839697..f86404f83a 100644 || entity instanceof EntityFireworks || entity instanceof EntityThrownTrident ) -- -2.25.1 +2.26.2 diff --git a/Spigot-Server-Patches/0030-Configurable-end-credits.patch b/Spigot-Server-Patches/0030-Configurable-end-credits.patch index c586adc11a..215fafc382 100644 --- a/Spigot-Server-Patches/0030-Configurable-end-credits.patch +++ b/Spigot-Server-Patches/0030-Configurable-end-credits.patch @@ -1,4 +1,4 @@ -From 93a13539a9014db15fc843302d3105691962514a Mon Sep 17 00:00:00 2001 +From 62ad837be8e703d41667e3db844a934f59933484 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 f7a0a33e49..50dec5cb5e 100644 + } } diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java -index 57ce9bde64..23c1706874 100644 +index 26e32aa1db..cd09b207c9 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 57ce9bde64..23c1706874 100644 this.cm = true; } -- -2.25.1 +2.26.2 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 d2760e5264..fcdb720c3e 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,4 +1,4 @@ -From d778699c1d27e184b08b5ea229b044414bfc84cb Mon Sep 17 00:00:00 2001 +From 1a91044449d17f5883561696be4bf072f5a2fde6 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 @@ -37,5 +37,5 @@ index c75ed9ddc1..c1f462d9d3 100644 return !(entity instanceof EntityHuman) || !entity.isSpectator() && !((EntityHuman) entity).isCreative(); }; -- -2.25.1 +2.26.2 diff --git a/Spigot-Server-Patches/0032-Optimize-explosions.patch b/Spigot-Server-Patches/0032-Optimize-explosions.patch index 9b4271d9f7..00c6cc9802 100644 --- a/Spigot-Server-Patches/0032-Optimize-explosions.patch +++ b/Spigot-Server-Patches/0032-Optimize-explosions.patch @@ -1,4 +1,4 @@ -From 6b503392be4decc2138d29182e99bdd03145f7e3 Mon Sep 17 00:00:00 2001 +From 756d58f146d9c136d05cb02edc280e5d68dbdab6 Mon Sep 17 00:00:00 2001 From: Byteflux Date: Wed, 2 Mar 2016 11:59:48 -0600 Subject: [PATCH] Optimize explosions diff --git a/Spigot-Server-Patches/0033-Disable-explosion-knockback.patch b/Spigot-Server-Patches/0033-Disable-explosion-knockback.patch index b869ec7073..b8de20a65a 100644 --- a/Spigot-Server-Patches/0033-Disable-explosion-knockback.patch +++ b/Spigot-Server-Patches/0033-Disable-explosion-knockback.patch @@ -1,4 +1,4 @@ -From 48750df2d12a6d642b28e35abef205824921ae61 Mon Sep 17 00:00:00 2001 +From 13c29f45410e471d936915e56102806068eaa96c Mon Sep 17 00:00:00 2001 From: Sudzzy Date: Wed, 2 Mar 2016 14:48:03 -0600 Subject: [PATCH] Disable explosion knockback @@ -19,7 +19,7 @@ index f038d3f7dc..25e0717186 100644 + } } diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java -index 35e3f1c78d..9bd6737007 100644 +index 690c1ce0f6..d4d60220ef 100644 --- a/src/main/java/net/minecraft/server/EntityLiving.java +++ b/src/main/java/net/minecraft/server/EntityLiving.java @@ -1073,6 +1073,7 @@ public abstract class EntityLiving extends Entity { @@ -69,5 +69,5 @@ index 5583860f15..d99d2defe9 100644 } } -- -2.25.1 +2.26.2 diff --git a/Spigot-Server-Patches/0034-Disable-thunder.patch b/Spigot-Server-Patches/0034-Disable-thunder.patch index 562239153e..f211a5ce75 100644 --- a/Spigot-Server-Patches/0034-Disable-thunder.patch +++ b/Spigot-Server-Patches/0034-Disable-thunder.patch @@ -1,4 +1,4 @@ -From 203e24c56357c7f87791b8e01ecc59b44e545fe4 Mon Sep 17 00:00:00 2001 +From 034f422a35f153691c5c7cd4575ef1a457ba2b51 Mon Sep 17 00:00:00 2001 From: Sudzzy Date: Wed, 2 Mar 2016 14:52:43 -0600 Subject: [PATCH] Disable thunder @@ -32,5 +32,5 @@ index 450b414298..856857d559 100644 if (this.isRainingAt(blockposition)) { DifficultyDamageScaler difficultydamagescaler = this.getDamageScaler(blockposition); -- -2.25.1 +2.26.2 diff --git a/Spigot-Server-Patches/0035-Disable-ice-and-snow.patch b/Spigot-Server-Patches/0035-Disable-ice-and-snow.patch index 06b5de608c..db38cc7eb3 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 7fb1549030943565fa14dd15b2aaed60d6732d22 Mon Sep 17 00:00:00 2001 +From 13b8e0c94fcd64936047baae7b9ffe19a7132aae Mon Sep 17 00:00:00 2001 From: Sudzzy Date: Wed, 2 Mar 2016 14:57:24 -0600 Subject: [PATCH] Disable ice and snow @@ -32,5 +32,5 @@ index 856857d559..a34df8ce5d 100644 BlockPosition blockposition1 = blockposition.down(); BiomeBase biomebase = this.getBiome(blockposition); -- -2.25.1 +2.26.2 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 1438cac75c..328ac36b66 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 8371a46288465ed7fe510f33afec01dbaab93282 Mon Sep 17 00:00:00 2001 +From 2b18ff0e52e64c85b5911e2eb3e99883adf5a0cb 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 0f23313e89..b249af20c4 100644 } -- -2.25.1 +2.26.2 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 78e582bae1..d8c5f259cb 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 37de5b98196c7a889e95c9d1b89966b3ae3e7c09 Mon Sep 17 00:00:00 2001 +From 10395b6165373c7b9fee5ad40e085d90e2d121e1 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,7 +77,7 @@ index a75e0ec54e..a13fd9b340 100644 this.c(); diff --git a/src/main/java/net/minecraft/server/PlayerChunkMap.java b/src/main/java/net/minecraft/server/PlayerChunkMap.java -index 2a6955f855..3dd72e0842 100644 +index 5e31b65e16..d49f456f73 100644 --- a/src/main/java/net/minecraft/server/PlayerChunkMap.java +++ b/src/main/java/net/minecraft/server/PlayerChunkMap.java @@ -1217,10 +1217,14 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d { @@ -107,5 +107,5 @@ index 2a6955f855..3dd72e0842 100644 } } else if (this.trackedPlayers.remove(entityplayer)) { -- -2.25.1 +2.26.2 diff --git a/Spigot-Server-Patches/0038-Add-BeaconEffectEvent.patch b/Spigot-Server-Patches/0038-Add-BeaconEffectEvent.patch index 117cb2bb42..16081b4ea9 100644 --- a/Spigot-Server-Patches/0038-Add-BeaconEffectEvent.patch +++ b/Spigot-Server-Patches/0038-Add-BeaconEffectEvent.patch @@ -1,4 +1,4 @@ -From 5ac25a0ea16c5596da57d29a473fad1488b70b6b Mon Sep 17 00:00:00 2001 +From cc7d3caaa3ac02321b1117eeafbed058af531375 Mon Sep 17 00:00:00 2001 From: Byteflux Date: Wed, 2 Mar 2016 23:30:53 -0600 Subject: [PATCH] Add BeaconEffectEvent @@ -67,5 +67,5 @@ index 536afe5312..df2d6c3b07 100644 } -- -2.25.1 +2.26.2 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 4c886ed1d2..4c79f11f6a 100644 --- a/Spigot-Server-Patches/0039-Configurable-container-update-tick-rate.patch +++ b/Spigot-Server-Patches/0039-Configurable-container-update-tick-rate.patch @@ -1,4 +1,4 @@ -From 83f9c922ea4a2223820573e8319324864516964c Mon Sep 17 00:00:00 2001 +From 355e6485b93162df559e244c86d0627ebd9d58c8 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 @@ -19,7 +19,7 @@ index 428deed56d..a4da22ea65 100644 + } } diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java -index 23c1706874..f0f456983f 100644 +index cd09b207c9..64635fe70f 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 23c1706874..f0f456983f 100644 this.closeInventory(); this.activeContainer = this.defaultContainer; -- -2.25.1 +2.26.2 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 c3a439d56f..3bfadbdfc3 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 9d71f9f229aae7b45e44f5b7144d0403e5617142 Mon Sep 17 00:00:00 2001 +From f660591d8db199bc2b9cd40d90e7f1eafd3d6f7c 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 a6e95a9097..4fb27cc7ed 100644 return true; -- -2.25.1 +2.26.2 diff --git a/Spigot-Server-Patches/0041-Disable-spigot-tick-limiters.patch b/Spigot-Server-Patches/0041-Disable-spigot-tick-limiters.patch index cff9702380..3e00e46962 100644 --- a/Spigot-Server-Patches/0041-Disable-spigot-tick-limiters.patch +++ b/Spigot-Server-Patches/0041-Disable-spigot-tick-limiters.patch @@ -1,4 +1,4 @@ -From c9684d7cf3639906c7f19f842e5c3628f60fdd42 Mon Sep 17 00:00:00 2001 +From 18580a16c97ec80425dacf5bc1f099772cc10d1d 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 @@ -20,5 +20,5 @@ index 4604634577..4d849719f4 100644 TileEntity tileentity = (TileEntity) this.tileEntityListTick.get(tileTickPosition); // Spigot start -- -2.25.1 +2.26.2 diff --git a/Spigot-Server-Patches/0042-Add-PlayerInitialSpawnEvent.patch b/Spigot-Server-Patches/0042-Add-PlayerInitialSpawnEvent.patch index 3e34dc2f82..ada56eb575 100644 --- a/Spigot-Server-Patches/0042-Add-PlayerInitialSpawnEvent.patch +++ b/Spigot-Server-Patches/0042-Add-PlayerInitialSpawnEvent.patch @@ -1,4 +1,4 @@ -From 43658573d4ef19c33b422ef10666e90068267cbd Mon Sep 17 00:00:00 2001 +From 2f2f30e296173f81723dde1480232744b4e444ef Mon Sep 17 00:00:00 2001 From: Steve Anton Date: Thu, 3 Mar 2016 00:09:38 -0600 Subject: [PATCH] Add PlayerInitialSpawnEvent @@ -9,7 +9,7 @@ This is a duplicate API from spigot, so use our duplicate subclass and improve setPosition to use raw diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java -index f28be11ee..541e3ce83 100644 +index f28be11eee..541e3ce830 100644 --- a/src/main/java/net/minecraft/server/PlayerList.java +++ b/src/main/java/net/minecraft/server/PlayerList.java @@ -119,14 +119,14 @@ public abstract class PlayerList { @@ -30,5 +30,5 @@ index f28be11ee..541e3ce83 100644 // Spigot end -- -2.25.1 +2.26.2 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 eaa5b71ee7..3fec5fd9c1 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 30a10e2157319ce6016dc206eb05da580e7f6a88 Mon Sep 17 00:00:00 2001 +From 2568cb155145b518aea9a0a881286c6b0c620e8d 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 033cb78d91..72fb92f7c3 100644 if (!list.isEmpty()) { -- -2.25.1 +2.26.2 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 8dd094308a..c8b565f8be 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 f257bfd57e675b1d5c23dc98d9f0e7afb4cf0745 Mon Sep 17 00:00:00 2001 +From 71c89ae4f0b988e40d788420d34090c9823827f9 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 914366afcd..5e8739462e 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 e3939387e7..f7c29e372f 100644 +index 99083a1f36..697246492a 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -720,6 +720,29 @@ public final class CraftServer implements Server { @@ -118,5 +118,5 @@ index e7b953ca31..ccea803f58 100644 { String[] split = restartScript.split( " " ); -- -2.25.1 +2.26.2 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 15bfdd2656..827160f518 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 840e5a36c96131f69f3a9867734e8f5019e3c86a Mon Sep 17 00:00:00 2001 +From 368d7cb1678fc3d9f89db71a829b8f7e14ffbc37 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 8e8526f371..3ecf732192 100644 if (random.nextInt(10) == 0 && flag && blockposition.getY() < 40) { return a(entitytypes, generatoraccess, enummobspawn, blockposition, random); -- -2.25.1 +2.26.2 diff --git a/Spigot-Server-Patches/0046-Expose-server-CommandMap.patch b/Spigot-Server-Patches/0046-Expose-server-CommandMap.patch index b4fb918274..7fa421a2e0 100644 --- a/Spigot-Server-Patches/0046-Expose-server-CommandMap.patch +++ b/Spigot-Server-Patches/0046-Expose-server-CommandMap.patch @@ -1,11 +1,11 @@ -From 99cba28e61e41a780f83190acf26fa1ce24f02bf Mon Sep 17 00:00:00 2001 +From d9be9e5a4f57b905508e9554fef34b3f04886ff1 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 f7c29e372f..6107070b33 100644 +index 697246492a..1cf8fd93a4 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -1629,6 +1629,7 @@ public final class CraftServer implements Server { @@ -17,5 +17,5 @@ index f7c29e372f..6107070b33 100644 return commandMap; } -- -2.25.1 +2.26.2 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 6696a90041..f7868452df 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,11 +1,11 @@ -From 285f963c7672a8825e5b1c6d56bc431503527da7 Mon Sep 17 00:00:00 2001 +From 6b296e8747151670d7b51810ec33a18b7293cf42 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 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java -index 4f20003193..54c0dae5d1 100644 +index 6146db1841..966d23add1 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java @@ -106,7 +106,10 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity { @@ -21,5 +21,5 @@ index 4f20003193..54c0dae5d1 100644 getHandle().setHealth((float) health); -- -2.25.1 +2.26.2 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 4e6e2aac10..0c47a1a731 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 251d521fd5ecdb7dada457fd503bbcebcf6beb32 Mon Sep 17 00:00:00 2001 +From a4f71b76f9e0244848bb9b0892f275cf7ba89d86 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 @@ -52,7 +52,7 @@ index 3a6e780007..535056c64e 100644 if (this.a == PacketPlayOutTitle.EnumTitleAction.TIMES) { diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index b3c8343239..657fd070b9 100644 +index 331555dc27..5f3b6ebbe4 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -1,5 +1,6 @@ @@ -160,5 +160,5 @@ index b3c8343239..657fd070b9 100644 public String getDisplayName() { return getHandle().displayName; -- -2.25.1 +2.26.2 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 050288111d..2e44dc4a53 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,4 +1,4 @@ -From a84fc1a0898f892699af702afd47839470a55eec Mon Sep 17 00:00:00 2001 +From 73e3d996112ef0a80fd46b30beb92cc8d355ff56 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 @@ -18,5 +18,5 @@ index e38438db6e..0c3a2f080c 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.25.1 +2.26.2 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 e49c3ec113..644d709543 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 3b07ec668b502206dbe64a7eb7207da8c515d0fb Mon Sep 17 00:00:00 2001 +From c05b5893e43278ce2f8ecfec657f6b31e98d7796 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 389fadf927..74be3e40d1 100644 +index 4d849719f4..6e8ac186c9 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -36,7 +36,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable { @@ -19,5 +19,5 @@ index 389fadf927..74be3e40d1 100644 private int c; protected int i = (new Random()).nextInt(); -- -2.25.1 +2.26.2 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 679fcc5df6..a6e41e2f52 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 01fa9f61451b0be80961d7c8a88080fa688bb798 Mon Sep 17 00:00:00 2001 +From b319a5e8f6288e7f39e76a2a564ce05681d8100f 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 diff --git a/Spigot-Server-Patches/0052-Add-velocity-warnings.patch b/Spigot-Server-Patches/0052-Add-velocity-warnings.patch index 5a1a7f8e80..daf88b7e63 100644 --- a/Spigot-Server-Patches/0052-Add-velocity-warnings.patch +++ b/Spigot-Server-Patches/0052-Add-velocity-warnings.patch @@ -1,4 +1,4 @@ -From 54551a9e6937621fd5cb7e26e89a03ebc43659b2 Mon Sep 17 00:00:00 2001 +From 84dc2e6c2ae2aa9fc259b1a472cb6bd21a42b4b6 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/Spigot-Server-Patches/0053-Configurable-inter-world-teleportation-safety.patch b/Spigot-Server-Patches/0053-Configurable-inter-world-teleportation-safety.patch index cb96975316..c8143ffa68 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 a627e87208c266c7d7ce88b57e0e1647fa3f07a0 Mon Sep 17 00:00:00 2001 +From 2eeedfab569f31c1742aeb96a0bc4ee16c2ac7e6 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 @@ -30,7 +30,7 @@ index cd47a4ca06..abbf59bb91 100644 + } } diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index 657fd070b9..2d6550efb8 100644 +index 5f3b6ebbe4..5ce7504c5f 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -759,7 +759,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player { @@ -43,5 +43,5 @@ index 657fd070b9..2d6550efb8 100644 return true; } -- -2.25.1 +2.26.2 diff --git a/Spigot-Server-Patches/0054-Add-exception-reporting-event.patch b/Spigot-Server-Patches/0054-Add-exception-reporting-event.patch index c1bed672af..3413fb8df8 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 16efb56660977b7dd9e27997f7d1e10931c6680c Mon Sep 17 00:00:00 2001 +From 2442a75dde041601a119e270ac0db9fbea769b3a 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 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 dec9c245d4..148a52d383 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 5f426a49c955320fe62c430f7fa2239a13455d49 Mon Sep 17 00:00:00 2001 +From f63660a943a8fba16b0aaa6ef611c6935c4b854b 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 @@ -26,5 +26,5 @@ index fa4eab5b0b..0ab611564e 100644 packetdataserializer.a(this.a); } -- -2.25.1 +2.26.2 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 16fbfe9e8e..ec959685cf 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 a3e6dafdcd480f3bc5898d5dd4e8058c88fd5ebb Mon Sep 17 00:00:00 2001 +From 98ec6b7cf28a3e3838f508be5f36fb8750059300 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 abbf59bb91..04430aae52 100644 + } } diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java -index fd708f2f6c..46c227b7f0 100644 +index 5892d344ad..10855cec1e 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java @@ -2269,6 +2269,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke @@ -37,7 +37,7 @@ index fd708f2f6c..46c227b7f0 100644 } diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java -index 9bd6737007..cd9c49747d 100644 +index d4d60220ef..591bf14a62 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 { @@ -49,5 +49,5 @@ index 9bd6737007..cd9c49747d 100644 if (!flag) { -- -2.25.1 +2.26.2 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 29a060d606..5e243cc87e 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,11 +1,11 @@ -From 6119d798c671daf0b5f9faa4bded2ec1c255a336 Mon Sep 17 00:00:00 2001 +From 4bbba33157c98db6b74b394a0725b98fa7ef1e24 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 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java -index 54c0dae5d1..e38f4f6910 100644 +index 966d23add1..da86ee4149 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java @@ -623,4 +623,16 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity { @@ -26,5 +26,5 @@ index 54c0dae5d1..e38f4f6910 100644 + // Paper end } -- -2.25.1 +2.26.2 diff --git a/Spigot-Server-Patches/0058-Complete-resource-pack-API.patch b/Spigot-Server-Patches/0058-Complete-resource-pack-API.patch index 0d794a43cf..a36e4c37bd 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 dec6bca4f8b0a134ac14184f999e4408e6931528 Mon Sep 17 00:00:00 2001 +From 3cd2a97bdd201676e91b79e7eff3af5289c57778 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 @@ -22,7 +22,7 @@ index 5e8739462e..3c8c9c9cd4 100644 // CraftBukkit end diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index 2d6550efb8..f2d820c399 100644 +index 5ce7504c5f..c4c3727850 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -133,6 +133,10 @@ public class CraftPlayer extends CraftHumanEntity implements Player { @@ -70,5 +70,5 @@ index 2d6550efb8..f2d820c399 100644 @Override -- -2.25.1 +2.26.2 diff --git a/Spigot-Server-Patches/0059-Chunk-Save-Reattempt.patch b/Spigot-Server-Patches/0059-Chunk-Save-Reattempt.patch index ffe9eb2540..dcbb7734ce 100644 --- a/Spigot-Server-Patches/0059-Chunk-Save-Reattempt.patch +++ b/Spigot-Server-Patches/0059-Chunk-Save-Reattempt.patch @@ -1,4 +1,4 @@ -From cd94c4ddbd37ac8e966180469b4aa6f92454f2f4 Mon Sep 17 00:00:00 2001 +From 10153a917b3bdf01ba8935cf148e78722bf05e15 Mon Sep 17 00:00:00 2001 From: Aikar Date: Mon, 4 Mar 2013 23:46:10 -0500 Subject: [PATCH] Chunk Save Reattempt 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 fd323ba618..08d400e0a7 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 990878456ceba6c4c1228cda75f1dcff3f20d08c Mon Sep 17 00:00:00 2001 +From b79d63f6e63664388654ee5dd5c52f005261b113 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 f402a29b09..6ef5bb9f32 100644 + } } diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 0cbf11aabb..30286a50d2 100644 +index d5311eb017..8f6eb08a4f 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -370,6 +370,7 @@ public final class CraftServer implements Server { @@ -51,5 +51,5 @@ index 0cbf11aabb..30286a50d2 100644 syncCommands(); } -- -2.25.1 +2.26.2 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 a879ab9ca3..7055784100 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 86da5e97c576d9d8425ab1d26626ea0b0312d58c Mon Sep 17 00:00:00 2001 +From 8fb4742f55e0600c6e4f1aa8bb5ff7ce0656c391 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 30286a50d2..c65e6256b5 100644 +index 8f6eb08a4f..2ed74cd9fc 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -2089,5 +2089,23 @@ public final class CraftServer implements Server { @@ -34,5 +34,5 @@ index 30286a50d2..c65e6256b5 100644 // Paper end } -- -2.25.1 +2.26.2 diff --git a/Spigot-Server-Patches/0062-Remove-Metadata-on-reload.patch b/Spigot-Server-Patches/0062-Remove-Metadata-on-reload.patch index 61c69112e1..919991250f 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 8ef555514105d3d78c839c54712a316598f46f47 Mon Sep 17 00:00:00 2001 +From 87f90f2050a86c072a3d9817d8d1f4e5a056fe41 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 c65e6256b5..cf0733baf7 100644 +index 2ed74cd9fc..ddb16ca8b6 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -825,8 +825,18 @@ public final class CraftServer implements Server { @@ -30,5 +30,5 @@ index c65e6256b5..cf0733baf7 100644 reloadData(); org.spigotmc.SpigotConfig.registerCommands(); // Spigot -- -2.25.1 +2.26.2 diff --git a/Spigot-Server-Patches/0063-Undead-horse-leashing.patch b/Spigot-Server-Patches/0063-Undead-horse-leashing.patch index 73c5c37a9d..e15c46d525 100644 --- a/Spigot-Server-Patches/0063-Undead-horse-leashing.patch +++ b/Spigot-Server-Patches/0063-Undead-horse-leashing.patch @@ -1,4 +1,4 @@ -From 1e58ad0c55592a067a4cad8ceeb6f5564fe5cfc9 Mon Sep 17 00:00:00 2001 +From 250964e7bf9d44a453df528c21d89e97496cc7ff Mon Sep 17 00:00:00 2001 From: Aikar Date: Fri, 18 Mar 2016 14:19:19 -0400 Subject: [PATCH] Undead horse leashing @@ -33,5 +33,5 @@ index b611ade248..c56efe035a 100644 @Override -- -2.25.1 +2.26.2 diff --git a/Spigot-Server-Patches/0064-Handle-Item-Meta-Inconsistencies.patch b/Spigot-Server-Patches/0064-Handle-Item-Meta-Inconsistencies.patch index d6b5c37f19..d8b9f20561 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 1da4ff23b69bd766323f53f3d9d65d5711fcbcc8 Mon Sep 17 00:00:00 2001 +From f9634dde4e5de99c5e737019f23742b402685c06 Mon Sep 17 00:00:00 2001 From: Aikar Date: Thu, 28 May 2015 23:00:19 -0400 Subject: [PATCH] Handle Item Meta Inconsistencies @@ -194,7 +194,7 @@ index 4a9132c701..3dd912abe3 100644 static Map getEnchantments(net.minecraft.server.ItemStack item) { diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java -index f46119ea4d..bd9e09f999 100644 +index f1c19d67dd..854836b839 100644 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java @@ -6,6 +6,7 @@ import com.google.common.collect.ImmutableList; @@ -330,5 +330,5 @@ index f46119ea4d..bd9e09f999 100644 + } -- -2.25.1 +2.26.2 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 824364fc2b..b796cbc18c 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 70269bcc8f0391a9b58de24b24a0732b3797fe4e Mon Sep 17 00:00:00 2001 +From 8e8d29b7f9cfdb5e9f28b625ab830d71b153237f 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 @@ -43,5 +43,5 @@ index a9f843aade..2b14b2c3fa 100644 } -- -2.25.1 +2.26.2 diff --git a/Spigot-Server-Patches/0066-Add-World-Util-Methods.patch b/Spigot-Server-Patches/0066-Add-World-Util-Methods.patch index 91368671ce..af6594ea40 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 2546f4b4f0ffb8a812a947499a9a512fc110dfdf Mon Sep 17 00:00:00 2001 +From f64329dd0808766437089823ae66dfb54772316c 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 6e68c013a4..c2039d0e46 100644 +index a6b2867094..e7337fc368 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -222,6 +222,18 @@ public abstract class World implements GeneratorAccess, AutoCloseable { @@ -41,5 +41,5 @@ index 020e5c171a..4ee13ac454 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.25.1 +2.26.2 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 334dc0b3d6..8bf98365bc 100644 --- a/Spigot-Server-Patches/0067-Custom-replacement-for-eaten-items.patch +++ b/Spigot-Server-Patches/0067-Custom-replacement-for-eaten-items.patch @@ -1,4 +1,4 @@ -From 71fb114207dc2bc7bdc49f6811e134adf3a31e12 Mon Sep 17 00:00:00 2001 +From f46b3339e7641d5ff21f758b7591b5ee43e94b5c 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/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 3887801629..054159509e 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,4 +1,4 @@ -From 4758bc377177cf7072d1761f5c28f5c913d2f839 Mon Sep 17 00:00:00 2001 +From b4aa85b3b64d30c5f2bd0722931ce3d3e45badc8 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/Spigot-Server-Patches/0069-Waving-banner-workaround.patch b/Spigot-Server-Patches/0069-Waving-banner-workaround.patch index 1b05163b48..a9849c6734 100644 --- a/Spigot-Server-Patches/0069-Waving-banner-workaround.patch +++ b/Spigot-Server-Patches/0069-Waving-banner-workaround.patch @@ -1,4 +1,4 @@ -From e38cfcffa3e993f204bb3951d7fa7237fc9f578e Mon Sep 17 00:00:00 2001 +From d42809993d8fee3c68b37e174b2170b4e4c3f8fd Mon Sep 17 00:00:00 2001 From: Gabscap Date: Sat, 19 Mar 2016 22:25:11 +0100 Subject: [PATCH] Waving banner workaround @@ -34,5 +34,5 @@ index 88c3d7efaf..15af5927f3 100644 @Override -- -2.25.1 +2.26.2 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 46fcec05c5..29f5511d9a 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 ceb3bdbb547c9e9eb98001df882d471e3954e899 Mon Sep 17 00:00:00 2001 +From 09b79a750e2cdaa0ed026e80f6575f14286e4981 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 46c227b7f0..e721053542 100644 +index 10855cec1e..58092a3d92 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 46c227b7f0..e721053542 100644 this.justCreated = true; this.uniqueID = MathHelper.a(this.random); -- -2.25.1 +2.26.2 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 5e1554dd0b..2e2132c3a7 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 b4f0c7aa46a509236ce5bf3606b5f13280c2be6b Mon Sep 17 00:00:00 2001 +From aecb585f00a83690a97dc9ad9d98e963affb533e 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 @@ -35,5 +35,5 @@ index a34df8ce5d..96ed2da1f8 100644 if (flag1) { EntityHorseSkeleton entityhorseskeleton = (EntityHorseSkeleton) EntityTypes.SKELETON_HORSE.a((World) this); -- -2.25.1 +2.26.2 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 8a4631f739..ad285e3437 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 6e68c9fdd1c3e759ba521c5c6dfeedcead37fc40 Mon Sep 17 00:00:00 2001 +From 1e4ea523df36a1139d0fd88aefe3e9848c908748 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 @@ -12,7 +12,7 @@ Replace all calls to the new place to the unnecessary forward. Optimize getType and getBlockData to manually inline and optimize the calls diff --git a/src/main/java/net/minecraft/server/BaseBlockPosition.java b/src/main/java/net/minecraft/server/BaseBlockPosition.java -index a3b5793e4..71089442c 100644 +index a3b5793e48..71089442c1 100644 --- a/src/main/java/net/minecraft/server/BaseBlockPosition.java +++ b/src/main/java/net/minecraft/server/BaseBlockPosition.java @@ -13,6 +13,14 @@ public class BaseBlockPosition implements Comparable { @@ -31,7 +31,7 @@ index a3b5793e4..71089442c 100644 public BaseBlockPosition(int i, int j, int k) { this.a = i; diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java -index ac11e214b..6e50efbf6 100644 +index 39e77f8248..7ddf6592f7 100644 --- a/src/main/java/net/minecraft/server/Chunk.java +++ b/src/main/java/net/minecraft/server/Chunk.java @@ -290,12 +290,24 @@ public class Chunk implements IChunkAccess { @@ -64,7 +64,7 @@ index ac11e214b..6e50efbf6 100644 IBlockData iblockdata = null; diff --git a/src/main/java/net/minecraft/server/ChunkSection.java b/src/main/java/net/minecraft/server/ChunkSection.java -index 652067757..0d5deee36 100644 +index 652067757a..0d5deee365 100644 --- a/src/main/java/net/minecraft/server/ChunkSection.java +++ b/src/main/java/net/minecraft/server/ChunkSection.java @@ -9,7 +9,7 @@ public class ChunkSection { @@ -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 e7337fc36..6b1ff8f64 100644 +index e7337fc368..6b1ff8f64f 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -171,11 +171,11 @@ public abstract class World implements GeneratorAccess, AutoCloseable { @@ -95,5 +95,5 @@ index e7337fc36..6b1ff8f64 100644 public static boolean b(int i) { -- -2.26.0 +2.26.2 diff --git a/Spigot-Server-Patches/0073-Access-items-by-EquipmentSlot.patch b/Spigot-Server-Patches/0073-Access-items-by-EquipmentSlot.patch index 6c3e8b3cc0..18509cd796 100644 --- a/Spigot-Server-Patches/0073-Access-items-by-EquipmentSlot.patch +++ b/Spigot-Server-Patches/0073-Access-items-by-EquipmentSlot.patch @@ -1,4 +1,4 @@ -From 39325403280c86ba742dfa67100a6d15d5e45d05 Mon Sep 17 00:00:00 2001 +From a8a49f91d3932c9927cb153c05609f1505726c0d 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 @@ -64,5 +64,5 @@ index 5873b76236..ef4cd7a7b6 100644 + // Paper end } -- -2.25.1 +2.26.2 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 3aa9f64810..ec8881b126 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 3847e222ad04802370aa46da6a280fdfa8a55500 Mon Sep 17 00:00:00 2001 +From 502e755dbee48a834cc2ec9b4365733b22f5db62 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 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 dd851547bd..68d7dac476 100644 --- a/Spigot-Server-Patches/0075-Entity-AddTo-RemoveFrom-World-Events.patch +++ b/Spigot-Server-Patches/0075-Entity-AddTo-RemoveFrom-World-Events.patch @@ -1,4 +1,4 @@ -From 69b72c17aec54133659cc54dc67c05c0c271bb93 Mon Sep 17 00:00:00 2001 +From 8329fdefafcca151133f8a8aa87fc35172878fa3 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 @@ -26,5 +26,5 @@ index 9d0edf5382..fd42f34004 100644 } -- -2.25.1 +2.26.2 diff --git a/Spigot-Server-Patches/0076-Configurable-Chunk-Inhabited-Time.patch b/Spigot-Server-Patches/0076-Configurable-Chunk-Inhabited-Time.patch index a6bfa18ccf..70b8795bd2 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 79b3ec2ccd919bc721820a23bacec43279699d65 Mon Sep 17 00:00:00 2001 +From b106a1543eb979b48adef29d0218e74cd85d9e61 Mon Sep 17 00:00:00 2001 From: Aikar Date: Mon, 28 Mar 2016 20:46:14 -0400 Subject: [PATCH] Configurable Chunk Inhabited Time @@ -11,7 +11,7 @@ For people who want all chunks to be treated equally, you can chose a fixed valu This allows to fine-tune vanilla gameplay. diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index 6ef0e1399..5872e6b17 100644 +index 6ef0e1399e..5872e6b171 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java @@ -236,4 +236,14 @@ public class PaperWorldConfig { @@ -30,7 +30,7 @@ index 6ef0e1399..5872e6b17 100644 + } } diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java -index 6e50efbf6..8963acb9f 100644 +index 7ddf6592f7..d1761ff3c4 100644 --- a/src/main/java/net/minecraft/server/Chunk.java +++ b/src/main/java/net/minecraft/server/Chunk.java @@ -956,7 +956,7 @@ public class Chunk implements IChunkAccess { @@ -43,5 +43,5 @@ index 6e50efbf6..8963acb9f 100644 @Override -- -2.26.0 +2.26.2 diff --git a/Spigot-Server-Patches/0077-EntityPathfindEvent.patch b/Spigot-Server-Patches/0077-EntityPathfindEvent.patch index 092422b875..81ea794bc4 100644 --- a/Spigot-Server-Patches/0077-EntityPathfindEvent.patch +++ b/Spigot-Server-Patches/0077-EntityPathfindEvent.patch @@ -1,4 +1,4 @@ -From a950dfc0c5d9101c836264e6da1b84cee9af940d Mon Sep 17 00:00:00 2001 +From 42343eac0abc983d8a61e91b5809fc7bde47e73f 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 5b057e96db..f16c6d1faa 100644 @Override -- -2.25.1 +2.26.2 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 0f35ac811d..36c319cb8b 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 39a4494332f1f9e6da9a37371eda0523611336f5 Mon Sep 17 00:00:00 2001 +From d89f075fe6b7d1c3c9048b2cf41b2dd23398b8a2 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. @@ -25,7 +25,7 @@ index 6ef5bb9f32..d500cd75a9 100644 + } } diff --git a/src/main/java/net/minecraft/server/RegionFileCache.java b/src/main/java/net/minecraft/server/RegionFileCache.java -index 2fe27b460d..57ce53cfdc 100644 +index fd46da95e0..5065ece393 100644 --- a/src/main/java/net/minecraft/server/RegionFileCache.java +++ b/src/main/java/net/minecraft/server/RegionFileCache.java @@ -25,7 +25,7 @@ public final class RegionFileCache implements AutoCloseable { @@ -38,5 +38,5 @@ index 2fe27b460d..57ce53cfdc 100644 } -- -2.25.1 +2.26.2 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 28318b2add..2fee840082 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,4 +1,4 @@ -From d633e665eee335b9034539c79130481e1cdaebf4 Mon Sep 17 00:00:00 2001 +From 7177740911357c93cc743f8eaf9fbc3a1e148949 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 @@ -83,5 +83,5 @@ index ef248ebcc4..4240ca81cb 100644 Material material = iblockdata.getMaterial(); -- -2.25.1 +2.26.2 diff --git a/Spigot-Server-Patches/0080-Add-PlayerUseUnknownEntityEvent.patch b/Spigot-Server-Patches/0080-Add-PlayerUseUnknownEntityEvent.patch index d7017f3db3..8e038e2584 100644 --- a/Spigot-Server-Patches/0080-Add-PlayerUseUnknownEntityEvent.patch +++ b/Spigot-Server-Patches/0080-Add-PlayerUseUnknownEntityEvent.patch @@ -1,4 +1,4 @@ -From 9effd94a85d6e6956b1c23a0770d912a9109c178 Mon Sep 17 00:00:00 2001 +From 62abcd15d89ffa11a409e1e3f32823e8e3e3ff15 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 3c8c9c9cd4..505189c82b 100644 } -- -2.25.1 +2.26.2 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 41527222d0..c6c12b13ef 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,11 +1,11 @@ -From 7881228b6ff1e754c83f21baf45fc29a103a1116 Mon Sep 17 00:00:00 2001 +From f1d1d42b895ba98532d394c35ceec862886b9c0a 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 diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java -index 541e3ce83..9691d84f2 100644 +index 541e3ce830..9691d84f2c 100644 --- a/src/main/java/net/minecraft/server/PlayerList.java +++ b/src/main/java/net/minecraft/server/PlayerList.java @@ -150,6 +150,7 @@ public abstract class PlayerList { @@ -17,5 +17,5 @@ index 541e3ce83..9691d84f2 100644 entityplayer.getStatisticManager().c(); entityplayer.B().a(entityplayer); -- -2.25.1 +2.26.2 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 30a6a0f1e1..16ec34a3b3 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 d72aac0ac63b4642cbbc18a52998675af8819a37 Mon Sep 17 00:00:00 2001 +From 49e9a07a84c5ecd9a5aa3d63c5963268f2e05837 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 @@ -32,5 +32,5 @@ index 9b25fc2f9e..2b19b6754a 100644 // CraftBukkit start if (org.bukkit.craftbukkit.event.CraftEventFactory.callBlockFadeEvent(worldserver, blockposition, Blocks.DIRT.getBlockData()).isCancelled()) { -- -2.25.1 +2.26.2 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 0072d23d3c..ed03744aef 100644 --- a/Spigot-Server-Patches/0083-Fix-Cancelling-BlockPlaceEvent-triggering-physics.patch +++ b/Spigot-Server-Patches/0083-Fix-Cancelling-BlockPlaceEvent-triggering-physics.patch @@ -1,4 +1,4 @@ -From 6a762fb7eb1144330bf2119ab4fe3c837ffaa7c1 Mon Sep 17 00:00:00 2001 +From 1cefaa9a672b3e58591c2ac43356124db0d8e250 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 @@ -17,5 +17,5 @@ index 1edd030865..aaedbaf4d7 100644 this.a(blockposition.east(), block, blockposition); this.a(blockposition.down(), block, blockposition); -- -2.25.1 +2.26.2 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 3e3428d750..f619251c9e 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 d1a4229370738cee1572ff2cd6283295bb074d91 Mon Sep 17 00:00:00 2001 +From cec31418064a1a10421fa38960d93e81bafa54d0 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 2edd9b8714..f9680b6830 100644 int k = j >> 6; int l = (i + 1) * this.b - 1 >> 6; -- -2.25.1 +2.26.2 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 6a4b586761..7726dc95cc 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 9d4c4eba8429847db18252ee8816ce155d6b3860 Mon Sep 17 00:00:00 2001 +From b0aeb42715aa2222b1a2628054587922b009a709 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 @@ -12,7 +12,7 @@ for this on CB at one point but I can't find it. We may need to do this ourselves at some point in the future. diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index 47f5f8055..b1d1a3c1f 100644 +index 47f5f8055e..b1d1a3c1f8 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java @@ -252,4 +252,9 @@ public class PaperWorldConfig { @@ -26,7 +26,7 @@ index 47f5f8055..b1d1a3c1f 100644 + } } diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java -index 505189c82..669d9a41d 100644 +index 505189c82b..669d9a41d6 100644 --- a/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java @@ -1648,7 +1648,16 @@ public class PlayerConnection implements PacketListenerPlayIn { @@ -48,7 +48,7 @@ index 505189c82..669d9a41d 100644 if (((LazyPlayerSet) event.getRecipients()).isLazy()) { for (Object recipient : minecraftServer.getPlayerList().players) { diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java -index 9691d84f2..9212501b8 100644 +index 9691d84f2c..9212501b8b 100644 --- a/src/main/java/net/minecraft/server/PlayerList.java +++ b/src/main/java/net/minecraft/server/PlayerList.java @@ -165,7 +165,7 @@ public abstract class PlayerList { @@ -61,5 +61,5 @@ index 9691d84f2..9212501b8 100644 playerconnection.a(entityplayer.locX(), entityplayer.locY(), entityplayer.locZ(), entityplayer.yaw, entityplayer.pitch); this.players.add(entityplayer); -- -2.25.1 +2.26.2 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 7b34bf467c..6ade6b8844 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 181ed0136ad9f2f861bb4dbc53cba79e5c9f4acf Mon Sep 17 00:00:00 2001 +From 5944abbca04dc1991485a3f8caf188f5af9502f6 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 @@ -6,7 +6,7 @@ Subject: [PATCH] Workaround for setting passengers on players SPIGOT-1915 & GH-114 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index f6b8bb6c7a..f668d86a9c 100644 +index 9a92b96ff1..a392632a72 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -768,6 +768,17 @@ public class CraftPlayer extends CraftHumanEntity implements Player { @@ -28,5 +28,5 @@ index f6b8bb6c7a..f668d86a9c 100644 public void setSneaking(boolean sneak) { getHandle().setSneaking(sneak); -- -2.25.1 +2.26.2 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 484f6ba2e0..3b0bd6dfd3 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 c41934486e47af3dfd38d9b7e06122f7ffb4ff0e Mon Sep 17 00:00:00 2001 +From a97b7b1b9b1c5929aaffda2925dcc329b4526c18 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 @@ -89,5 +89,5 @@ index fd42f34004..6f66c38650 100644 while (iterator.hasNext()) { TileEntity tileentity = (TileEntity) iterator.next(); -- -2.25.1 +2.26.2 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 3fd9ae06e2..dcc7ea1794 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 aa3c85e73540652a7d9b073ac2b44496dd00f1a4 Mon Sep 17 00:00:00 2001 +From 43fe866388e181882a33f5bc40a3d2bf1e5accdd 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 99442bb130..177cceb77f 100644 Block block = this.getBlock().getBlock(); -- -2.25.1 +2.26.2 diff --git a/Spigot-Server-Patches/0089-Configurable-Player-Collision.patch b/Spigot-Server-Patches/0089-Configurable-Player-Collision.patch index c1ee508ba5..3ac11b043e 100644 --- a/Spigot-Server-Patches/0089-Configurable-Player-Collision.patch +++ b/Spigot-Server-Patches/0089-Configurable-Player-Collision.patch @@ -1,11 +1,11 @@ -From 92338d29aa23def6ba856d3d50d70f1d4d50b76a Mon Sep 17 00:00:00 2001 +From a0482f792d823cfb102cbbb3a7089f8e1ca93870 Mon Sep 17 00:00:00 2001 From: Aikar Date: Wed, 13 Apr 2016 02:10:49 -0400 Subject: [PATCH] Configurable Player Collision diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java -index d500cd75a..e4f0db64c 100644 +index d500cd75a9..e4f0db64c0 100644 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java @@ -223,4 +223,9 @@ public class PaperConfig { @@ -19,7 +19,7 @@ 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 1d3f1be24..f82be54cc 100644 +index 773f93edb7..36d20d5e3a 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -454,6 +454,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 963dbd0648..d0b9c6e3dc 100644 if ( split.length == 3 || split.length == 4 ) { packethandshakinginsetprotocol.hostname = split[0]; -- -2.25.1 +2.26.2 diff --git a/Spigot-Server-Patches/0091-Configurable-RCON-IP-address.patch b/Spigot-Server-Patches/0091-Configurable-RCON-IP-address.patch index 7a261e84a3..3fb2a027ae 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 fc59bfa96e3a3c9ebcadd8f640334476a4925fa5 Mon Sep 17 00:00:00 2001 +From 2f6eb4e6e9fa1f88646a2026a1d3330e79f36d50 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 e48d6dcd74..2ce490be00 100644 this.i = "0.0.0.0"; } -- -2.25.1 +2.26.2 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 5a453eb752..342a24c0f6 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 6dc2a1dac812d060e40cac3d4230e69657431ce6 Mon Sep 17 00:00:00 2001 +From 61f260d5704920bcccc81697511e86a7a7036fba 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 @@ -7,7 +7,7 @@ This causes the nether to spam unload/reload chunks, plus overall bad behavior. diff --git a/src/main/java/net/minecraft/server/BlockFire.java b/src/main/java/net/minecraft/server/BlockFire.java -index 2909f78f8..d32857c87 100644 +index 2909f78f87..d32857c872 100644 --- a/src/main/java/net/minecraft/server/BlockFire.java +++ b/src/main/java/net/minecraft/server/BlockFire.java @@ -78,7 +78,7 @@ public class BlockFire extends Block { @@ -80,5 +80,5 @@ index 2909f78f8..d32857c87 100644 @Override -- -2.25.1 +2.26.2 diff --git a/Spigot-Server-Patches/0093-Implement-PlayerLocaleChangeEvent.patch b/Spigot-Server-Patches/0093-Implement-PlayerLocaleChangeEvent.patch index f5dda2aa3c..335e5cabfa 100644 --- a/Spigot-Server-Patches/0093-Implement-PlayerLocaleChangeEvent.patch +++ b/Spigot-Server-Patches/0093-Implement-PlayerLocaleChangeEvent.patch @@ -1,4 +1,4 @@ -From f899cd8bfbbdbf476382b7a1ef2ed4086002facb Mon Sep 17 00:00:00 2001 +From 2a4220303570d469fb079084ef8db82a8b020e54 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/Spigot-Server-Patches/0094-EntityRegainHealthEvent-isFastRegen-API.patch b/Spigot-Server-Patches/0094-EntityRegainHealthEvent-isFastRegen-API.patch index 043ef36424..63e12ee671 100644 --- a/Spigot-Server-Patches/0094-EntityRegainHealthEvent-isFastRegen-API.patch +++ b/Spigot-Server-Patches/0094-EntityRegainHealthEvent-isFastRegen-API.patch @@ -1,4 +1,4 @@ -From aebbf2369275f889e42f0a4e16f0ae16bcc462a6 Mon Sep 17 00:00:00 2001 +From 34bdf0dafec4d014f808715594a14ddd83db6da4 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,7 +6,7 @@ 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 08d0728e16..dd1caec9da 100644 +index 07c8f38f86..56c8b56b06 100644 --- a/src/main/java/net/minecraft/server/EntityLiving.java +++ b/src/main/java/net/minecraft/server/EntityLiving.java @@ -924,10 +924,16 @@ public abstract class EntityLiving extends Entity { @@ -41,5 +41,5 @@ index 01d702d5ca..c3a9a9bd45 100644 this.foodTickTimer = 0; } -- -2.25.1 +2.26.2 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 50c9fe844c..f3e8264539 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 44de22c81f2c3d70bf81b5808bf3503756d037b4 Mon Sep 17 00:00:00 2001 +From 78d82eb02a7b1f6cb7b3ec388d930f7a5f31abfd 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 @@ -54,5 +54,5 @@ index af17aba8b8..5e414138e4 100644 } -- -2.25.1 +2.26.2 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 1c49bcfa44..80a2f320b5 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 8d22e60952c1d60ef7d029996897a2134b2a5753 Mon Sep 17 00:00:00 2001 +From c9ad13a021cfb749f8be0ba04e1f35603fe335f9 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 diff --git a/Spigot-Server-Patches/0097-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch b/Spigot-Server-Patches/0097-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch index 9320fc4554..f4e00a8fab 100644 --- a/Spigot-Server-Patches/0097-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch +++ b/Spigot-Server-Patches/0097-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch @@ -1,4 +1,4 @@ -From a51e20fdf53d15d38e1783e89d23329066072d24 Mon Sep 17 00:00:00 2001 +From 8fc2a9f39c35e1b30d5cee04f39002520ba81186 Mon Sep 17 00:00:00 2001 From: Aikar 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 26adb55409..b407d80ae6 100644 +index 1f20fbbf92..0e8ba05455 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 { @@ -127,5 +127,5 @@ index 256a131781..5768cd512e 100644 public RenderData() { -- -2.25.1 +2.26.2 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 abbc6af306..80aebb5d04 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 b51b20397015731c3d7bf2b9905d14c1116c76ab Mon Sep 17 00:00:00 2001 +From 8c1b8e54193775a9e2ed13bb9b26b8b74a737b67 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 0000000000..d50410532c + } +} diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java -index e721053542..4fd0e54de7 100644 +index 58092a3d92..7b295f4673 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 @@ -756,5 +756,5 @@ index 334bd5bb3f..f5b31237fc 100644 public CraftMinecartHopper(CraftServer server, EntityMinecartHopper entity) { -- -2.25.1 +2.26.2 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 9d5280425c..c6bf61d2a2 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 1b034a1522ff6477cdba7cf9adc8a6feeeda8a6e Mon Sep 17 00:00:00 2001 +From 67a608c152230f5c5e3459a40413771a226085ed 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 1eab0c310d..6bf66972f9 100644 nbttagcompound.setString("Name", scoreboardteam.getName()); -- -2.25.1 +2.26.2 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 0bbac2c2f4..35936d65ef 100644 --- a/Spigot-Server-Patches/0100-System-property-for-disabling-watchdoge.patch +++ b/Spigot-Server-Patches/0100-System-property-for-disabling-watchdoge.patch @@ -1,4 +1,4 @@ -From 130742bebac4a56a634d1f36cb556b2472e15793 Mon Sep 17 00:00:00 2001 +From 4d0faf8e4e7f5d5624935cf833db8eafd501c1c1 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 @@ -18,5 +18,5 @@ index d961000611..121c7ff601 100644 Logger log = Bukkit.getServer().getLogger(); log.log( Level.SEVERE, "------------------------------" ); -- -2.25.1 +2.26.2 diff --git a/Spigot-Server-Patches/0101-Optimize-UserCache-Thread-Safe.patch b/Spigot-Server-Patches/0101-Optimize-UserCache-Thread-Safe.patch index c3d4fe3d4f..34c6a3a30c 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 42a7de04cb2af799968c585b59635d5e9814a12f Mon Sep 17 00:00:00 2001 +From ec8f872ec6d8766f5f5c088ba89d7906a3f7bbd6 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,7 +10,7 @@ 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 f45c658770..bdc98d12c6 100644 +index a5aa6553cc..35d31a9c36 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -760,7 +760,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant Date: Mon, 16 May 2016 23:19:16 -0400 Subject: [PATCH] Avoid blocking on Network Manager creation @@ -43,5 +43,5 @@ index e7e2168508..37a22ba6f7 100644 if ( org.spigotmc.SpigotConfig.playerShuffle > 0 && MinecraftServer.currentTick % org.spigotmc.SpigotConfig.playerShuffle == 0 ) { -- -2.25.1 +2.26.2 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 fc3f804164..52f55a2fe4 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 a473c1fc4ba440d60d3c4931b99bc8e96cbf90c1 Mon Sep 17 00:00:00 2001 +From ad3a24ae6121d99c3f4daed4878346628c2f676f 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 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 ac12510ed7..ee2f961fba 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 f2dd438fb714b40068d2c0abed509fc95dc8ecd1 Mon Sep 17 00:00:00 2001 +From 22f9fbc6d5e5f74244f4daa7803a1ca297f1b956 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 98a255ae57..4c3062ece9 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 1dccc2e0dd..05ee02c4c2 100644 +index 0e8d31babd..86de3c634d 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -84,6 +84,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable { @@ -89,5 +89,5 @@ index 1dccc2e0dd..05ee02c4c2 100644 public CraftWorld getWorld() { return this.world; -- -2.25.1 +2.26.2 diff --git a/Spigot-Server-Patches/0105-Add-server-name-parameter.patch b/Spigot-Server-Patches/0105-Add-server-name-parameter.patch index c24eadc572..6607394941 100644 --- a/Spigot-Server-Patches/0105-Add-server-name-parameter.patch +++ b/Spigot-Server-Patches/0105-Add-server-name-parameter.patch @@ -1,11 +1,11 @@ -From d1ba8576073b4203c6c32b8c7119a18718089c56 Mon Sep 17 00:00:00 2001 +From 48366d69c03dc877f1738ddd8e106e422cf938f0 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 ba0fe4ae2c..93fcfd5f39 100644 +index 1ee4050609..afbe711acb 100644 --- a/src/main/java/org/bukkit/craftbukkit/Main.java +++ b/src/main/java/org/bukkit/craftbukkit/Main.java @@ -137,6 +137,14 @@ public class Main { @@ -24,5 +24,5 @@ index ba0fe4ae2c..93fcfd5f39 100644 }; -- -2.25.1 +2.26.2 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 8091a4738d..d979446e90 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 23d12b3f23a7e5f6ef88d9035ea7de322de15a8c Mon Sep 17 00:00:00 2001 +From f141e318dd22df3d6fdc2eb58f4e3d5447fdb4f8 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 2edf466ee2..2e95069c19 100644 double deltaZ = this.locZ() - player.locZ(); double distanceSquared = deltaX * deltaX + deltaZ * deltaZ; -- -2.25.1 +2.26.2 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 10693c7e0b..1ee083c527 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 980d7f83d54c8d4f311aa290850af45bc063ae21 Mon Sep 17 00:00:00 2001 +From 0b2ec2fe2555ad78369bf25ddb552d6a3f03edbc 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 @@ -20,5 +20,5 @@ index 40c9cba760..3004270455 100644 // WorldServer.LOGGER.warn("Tried to add entity {} but it was marked as removed already", EntityTypes.getName(entity.getEntityType())); // CraftBukkit return false; -- -2.25.1 +2.26.2 diff --git a/Spigot-Server-Patches/0108-Fix-Old-Sign-Conversion.patch b/Spigot-Server-Patches/0108-Fix-Old-Sign-Conversion.patch index 13c90673ec..97d817ff74 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 4321a53c73a8eae0cb4ae25eb98f999c3ecd31b2 Mon Sep 17 00:00:00 2001 +From 8ee372396e90b9726ce78e193b6215290e45300a 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 4a48c09e96..03f6ddf000 100644 if (this.world instanceof WorldServer) { try { -- -2.25.1 +2.26.2 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 b13c0b9e7c..59529544bd 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,4 +1,4 @@ -From 414e1da5db9df44fc30b74865132ce7174effe1d Mon Sep 17 00:00:00 2001 +From ce653accafa8063528892b6926d01c3380613418 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 @@ -18,5 +18,5 @@ index d32bec70d0..581199e6dc 100644 GameProfile gameprofile = new GameProfile(uuid, s); -- -2.25.1 +2.26.2 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 a5d82b1c74..d777f05d32 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 a4a1ae77f7c296eb94d83adfc577512828e619da Mon Sep 17 00:00:00 2001 +From 10f597b4f668d81719a369172d09d60a26df4c6f 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 669d9a41d6..7476f07aa1 100644 Location curPos = this.getPlayer().getLocation(); // Spigot -- -2.25.1 +2.26.2 diff --git a/Spigot-Server-Patches/0111-Add-setting-for-proxy-online-mode-status.patch b/Spigot-Server-Patches/0111-Add-setting-for-proxy-online-mode-status.patch index 8bab5df759..79eed5190f 100644 --- a/Spigot-Server-Patches/0111-Add-setting-for-proxy-online-mode-status.patch +++ b/Spigot-Server-Patches/0111-Add-setting-for-proxy-online-mode-status.patch @@ -1,11 +1,11 @@ -From f769f45108864c73e6c1b3e096870a904d8bb99a Mon Sep 17 00:00:00 2001 +From c773110496df7bacfb632c22a52695037fe942a9 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 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java -index 67f35fe6..53f96a15 100644 +index 67f35fe66b..53f96a1576 100644 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java @@ -22,6 +22,7 @@ import org.bukkit.configuration.InvalidConfigurationException; @@ -31,7 +31,7 @@ index 67f35fe6..53f96a15 100644 + } } diff --git a/src/main/java/net/minecraft/server/NameReferencingFileConverter.java b/src/main/java/net/minecraft/server/NameReferencingFileConverter.java -index 1422503e..d3c2e1be 100644 +index 1422503e11..d3c2e1bedf 100644 --- a/src/main/java/net/minecraft/server/NameReferencingFileConverter.java +++ b/src/main/java/net/minecraft/server/NameReferencingFileConverter.java @@ -58,7 +58,8 @@ public class NameReferencingFileConverter { @@ -45,7 +45,7 @@ index 1422503e..d3c2e1be 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 cf0733ba..1c25dc8f 100644 +index ddb16ca8b6..a27783dcf3 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -1399,7 +1399,8 @@ public final class CraftServer implements Server { @@ -59,5 +59,5 @@ index cf0733ba..1c25dc8f 100644 profile = console.getUserCache().getProfile( name ); } -- -2.25.1.windows.1 +2.26.2 diff --git a/Spigot-Server-Patches/0112-Optimise-BlockState-s-hashCode-equals.patch b/Spigot-Server-Patches/0112-Optimise-BlockState-s-hashCode-equals.patch index 1a30cb6784..5fb894a0e0 100644 --- a/Spigot-Server-Patches/0112-Optimise-BlockState-s-hashCode-equals.patch +++ b/Spigot-Server-Patches/0112-Optimise-BlockState-s-hashCode-equals.patch @@ -1,4 +1,4 @@ -From bef6f5e0736412aec113d29e4fc408e0596960b8 Mon Sep 17 00:00:00 2001 +From 1cb6313f502ddae207028d16431f9c324bb6041f 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 @@ -9,7 +9,7 @@ object identity checks safely. Use a simpler optimized hashcode diff --git a/src/main/java/net/minecraft/server/BlockState.java b/src/main/java/net/minecraft/server/BlockState.java -index 0ce77d92..00e67b56 100644 +index 0ce77d9230..00e67b567f 100644 --- a/src/main/java/net/minecraft/server/BlockState.java +++ b/src/main/java/net/minecraft/server/BlockState.java @@ -28,23 +28,13 @@ public abstract class BlockState> implements IBlockState @@ -41,7 +41,7 @@ index 0ce77d92..00e67b56 100644 public int c() { diff --git a/src/main/java/net/minecraft/server/BlockStateBoolean.java b/src/main/java/net/minecraft/server/BlockStateBoolean.java -index d8738447..7ca302b5 100644 +index d8738447d7..7ca302b522 100644 --- a/src/main/java/net/minecraft/server/BlockStateBoolean.java +++ b/src/main/java/net/minecraft/server/BlockStateBoolean.java @@ -30,8 +30,7 @@ public class BlockStateBoolean extends BlockState { @@ -55,7 +55,7 @@ index d8738447..7ca302b5 100644 return true; } else if (object instanceof BlockStateBoolean && super.equals(object)) { diff --git a/src/main/java/net/minecraft/server/BlockStateEnum.java b/src/main/java/net/minecraft/server/BlockStateEnum.java -index 1486d460..7cdadc6b 100644 +index 1486d460c8..7cdadc6b6a 100644 --- a/src/main/java/net/minecraft/server/BlockStateEnum.java +++ b/src/main/java/net/minecraft/server/BlockStateEnum.java @@ -49,8 +49,7 @@ public class BlockStateEnum & INamable> extends BlockState @@ -69,7 +69,7 @@ index 1486d460..7cdadc6b 100644 return true; } else if (object instanceof BlockStateEnum && super.equals(object)) { diff --git a/src/main/java/net/minecraft/server/BlockStateInteger.java b/src/main/java/net/minecraft/server/BlockStateInteger.java -index 6f35c365..0499a717 100644 +index 6f35c365f9..0499a71705 100644 --- a/src/main/java/net/minecraft/server/BlockStateInteger.java +++ b/src/main/java/net/minecraft/server/BlockStateInteger.java @@ -38,8 +38,7 @@ public class BlockStateInteger extends BlockState { @@ -83,5 +83,5 @@ index 6f35c365..0499a717 100644 return true; } else if (object instanceof BlockStateInteger && super.equals(object)) { -- -2.25.1.windows.1 +2.26.2 diff --git a/Spigot-Server-Patches/0113-Configurable-packet-in-spam-threshold.patch b/Spigot-Server-Patches/0113-Configurable-packet-in-spam-threshold.patch index 31408ad94e..5d912a4d1d 100644 --- a/Spigot-Server-Patches/0113-Configurable-packet-in-spam-threshold.patch +++ b/Spigot-Server-Patches/0113-Configurable-packet-in-spam-threshold.patch @@ -1,11 +1,11 @@ -From 5ca2647df8db59e280e0339d47eca2e6491b5a44 Mon Sep 17 00:00:00 2001 +From ec00ef4b1c1c3af3cb1732472a58105d9354d942 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 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java -index 53f96a15..010b17d2 100644 +index 53f96a1576..010b17d2e7 100644 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java @@ -243,4 +243,13 @@ public class PaperConfig { @@ -23,7 +23,7 @@ index 53f96a15..010b17d2 100644 + } } diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java -index 7476f07a..f057ebda 100644 +index 7476f07aa1..f057ebda81 100644 --- a/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java @@ -1204,13 +1204,14 @@ public class PlayerConnection implements PacketListenerPlayIn { @@ -44,5 +44,5 @@ index 7476f07a..f057ebda 100644 limitedPackets = 0; return true; -- -2.25.1.windows.1 +2.26.2 diff --git a/Spigot-Server-Patches/0114-Configurable-flying-kick-messages.patch b/Spigot-Server-Patches/0114-Configurable-flying-kick-messages.patch index 9252450c17..9c7cdf0db9 100644 --- a/Spigot-Server-Patches/0114-Configurable-flying-kick-messages.patch +++ b/Spigot-Server-Patches/0114-Configurable-flying-kick-messages.patch @@ -1,11 +1,11 @@ -From 32e8c434b4561dfdc75a82a414d27d77ad48b16f Mon Sep 17 00:00:00 2001 +From 8df499ad8fa76fbdc030ae20aaaace12da1a23a2 Mon Sep 17 00:00:00 2001 From: kashike Date: Tue, 20 Sep 2016 00:58:01 +0000 Subject: [PATCH] Configurable flying kick messages diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java -index 010b17d2..5a83fc21 100644 +index 010b17d2e7..5a83fc21cb 100644 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java @@ -252,4 +252,11 @@ public class PaperConfig { @@ -21,7 +21,7 @@ index 010b17d2..5a83fc21 100644 + } } diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java -index f057ebda..5b304c04 100644 +index f057ebda81..5b304c04bc 100644 --- a/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java @@ -147,7 +147,7 @@ public class PlayerConnection implements PacketListenerPlayIn { @@ -43,5 +43,5 @@ index f057ebda..5b304c04 100644 } } else { -- -2.25.1.windows.1 +2.26.2 diff --git a/Spigot-Server-Patches/0115-Chunk-registration-fixes.patch b/Spigot-Server-Patches/0115-Chunk-registration-fixes.patch index 06a7868b06..dee6367a69 100644 --- a/Spigot-Server-Patches/0115-Chunk-registration-fixes.patch +++ b/Spigot-Server-Patches/0115-Chunk-registration-fixes.patch @@ -1,4 +1,4 @@ -From 45d68970559eb14d25442d51f220fb6edff10f15 Mon Sep 17 00:00:00 2001 +From e647e4285927a922c060a85f5d9282058d4cca2c Mon Sep 17 00:00:00 2001 From: Aikar Date: Wed, 21 Sep 2016 22:54:28 -0400 Subject: [PATCH] Chunk registration fixes @@ -8,7 +8,7 @@ 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 30042704..eb99f3a9 100644 +index 3004270455..eb99f3a967 100644 --- a/src/main/java/net/minecraft/server/WorldServer.java +++ b/src/main/java/net/minecraft/server/WorldServer.java @@ -696,7 +696,7 @@ public class WorldServer extends World { @@ -21,5 +21,5 @@ index 30042704..eb99f3a9 100644 if (!entity.inChunk || entity.chunkX != i || entity.chunkY != j || entity.chunkZ != k) { -- -2.25.1.windows.1 +2.26.2 diff --git a/Spigot-Server-Patches/0116-Remove-FishingHook-reference-on-Craft-Entity-removal.patch b/Spigot-Server-Patches/0116-Remove-FishingHook-reference-on-Craft-Entity-removal.patch index ff0d007afc..7e9c33ec27 100644 --- a/Spigot-Server-Patches/0116-Remove-FishingHook-reference-on-Craft-Entity-removal.patch +++ b/Spigot-Server-Patches/0116-Remove-FishingHook-reference-on-Craft-Entity-removal.patch @@ -1,11 +1,11 @@ -From aee342c48579a1ce3e7383f8c26746807103cc29 Mon Sep 17 00:00:00 2001 +From 499d387857d107c99875de30d18d3bcc5f617166 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 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftFishHook.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftFishHook.java -index cd04a2b9..174b9f54 100644 +index 257ce11664..d45bba0c97 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftFishHook.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftFishHook.java @@ -66,4 +66,15 @@ public class CraftFishHook extends AbstractProjectile implements FishHook { @@ -25,5 +25,5 @@ index cd04a2b9..174b9f54 100644 + } -- -2.25.1.windows.1 +2.26.2 diff --git a/Spigot-Server-Patches/0117-Auto-fix-bad-Y-levels-on-player-login.patch b/Spigot-Server-Patches/0117-Auto-fix-bad-Y-levels-on-player-login.patch index 073dc95ef7..b3a535c01a 100644 --- a/Spigot-Server-Patches/0117-Auto-fix-bad-Y-levels-on-player-login.patch +++ b/Spigot-Server-Patches/0117-Auto-fix-bad-Y-levels-on-player-login.patch @@ -1,4 +1,4 @@ -From 3ba304dde4eaa20b0d3da20b280e6a5f9d0879a2 Mon Sep 17 00:00:00 2001 +From 2bad213558c63e7cbf97dc68d6ae0983e4b8896f 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 d4bba876..222bb312 100644 +index aca885db36..83ffee35fb 100644 --- a/src/main/java/net/minecraft/server/EntityPlayer.java +++ b/src/main/java/net/minecraft/server/EntityPlayer.java @@ -197,6 +197,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting { @@ -18,5 +18,5 @@ index d4bba876..222bb312 100644 if (this.getMinecraftServer().getForceGamemode()) { this.playerInteractManager.setGameMode(this.getMinecraftServer().getGamemode()); -- -2.25.1.windows.1 +2.26.2 diff --git a/Spigot-Server-Patches/0118-Option-to-remove-corrupt-tile-entities.patch b/Spigot-Server-Patches/0118-Option-to-remove-corrupt-tile-entities.patch index d31c3dc3de..c4de023269 100644 --- a/Spigot-Server-Patches/0118-Option-to-remove-corrupt-tile-entities.patch +++ b/Spigot-Server-Patches/0118-Option-to-remove-corrupt-tile-entities.patch @@ -1,11 +1,11 @@ -From 8b83c17ec516576320f3251f9add49a1c30dfcdf Mon Sep 17 00:00:00 2001 +From 6f764fa39b2b86ce5152769b4cab6a32dca28a6d 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/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index 8cf3076f..721eceef 100644 +index 8cf3076f4e..721eceeffc 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java @@ -298,4 +298,9 @@ public class PaperWorldConfig { @@ -19,7 +19,7 @@ index 8cf3076f..721eceef 100644 + } } diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java -index 8963acb9..bb58fb79 100644 +index d1761ff3c4..e66bbb7ee3 100644 --- a/src/main/java/net/minecraft/server/Chunk.java +++ b/src/main/java/net/minecraft/server/Chunk.java @@ -616,6 +616,12 @@ public class Chunk implements IChunkAccess { @@ -36,5 +36,5 @@ index 8963acb9..bb58fb79 100644 // CraftBukkit end } -- -2.25.1.windows.1 +2.26.2 diff --git a/Spigot-Server-Patches/0119-Add-EntityZapEvent.patch b/Spigot-Server-Patches/0119-Add-EntityZapEvent.patch index b2edd24472..a94adc69b3 100644 --- a/Spigot-Server-Patches/0119-Add-EntityZapEvent.patch +++ b/Spigot-Server-Patches/0119-Add-EntityZapEvent.patch @@ -1,11 +1,11 @@ -From d7dc0221e397f8332fb4724121b7c2174af395ba Mon Sep 17 00:00:00 2001 +From d95f4ff8e1d12beaa62aeb7e3246e727caf18f45 Mon Sep 17 00:00:00 2001 From: AlphaBlend Date: Sun, 16 Oct 2016 23:19:30 -0700 Subject: [PATCH] Add EntityZapEvent diff --git a/src/main/java/net/minecraft/server/EntityPig.java b/src/main/java/net/minecraft/server/EntityPig.java -index 5c24e22c..8d277566 100644 +index 5c24e22c7d..8d277566e9 100644 --- a/src/main/java/net/minecraft/server/EntityPig.java +++ b/src/main/java/net/minecraft/server/EntityPig.java @@ -164,6 +164,12 @@ public class EntityPig extends EntityAnimal { @@ -22,7 +22,7 @@ index 5c24e22c..8d277566 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 f7234705..5e383585 100644 +index f723470503..5e3835851d 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 @@ -39,10 +39,10 @@ index f7234705..5e383585 100644 entitywitch.prepare(this.world, this.world.getDamageScaler(new BlockPosition(entitywitch)), EnumMobSpawn.CONVERSION, (GroupDataEntity) null, (NBTTagCompound) null); entitywitch.setNoAI(this.isNoAI()); diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -index 72b8677f..2d454a3c 100644 +index c7ad049d12..a09de16554 100644 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -@@ -1045,6 +1045,14 @@ public class CraftEventFactory { +@@ -1052,6 +1052,14 @@ public class CraftEventFactory { return event; } @@ -58,5 +58,5 @@ index 72b8677f..2d454a3c 100644 HorseJumpEvent event = new HorseJumpEvent((AbstractHorse) horse.getBukkitEntity(), power); horse.getBukkitEntity().getServer().getPluginManager().callEvent(event); -- -2.25.1.windows.1 +2.26.2 diff --git a/Spigot-Server-Patches/0120-Filter-bad-data-from-ArmorStand-and-SpawnEgg-items.patch b/Spigot-Server-Patches/0120-Filter-bad-data-from-ArmorStand-and-SpawnEgg-items.patch index e3db6fd09f..f75a8ebe34 100644 --- a/Spigot-Server-Patches/0120-Filter-bad-data-from-ArmorStand-and-SpawnEgg-items.patch +++ b/Spigot-Server-Patches/0120-Filter-bad-data-from-ArmorStand-and-SpawnEgg-items.patch @@ -1,11 +1,11 @@ -From a31f3551cbd2ac2a1b306cf31033ba910c741e24 Mon Sep 17 00:00:00 2001 +From fc9b468c5ac3f558ecd43b5a615b7c99e085fa65 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 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index 721eceef..bff2e9d2 100644 +index 721eceeffc..bff2e9d26d 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java @@ -2,6 +2,7 @@ package com.destroystokyo.paper; @@ -30,7 +30,7 @@ index 721eceef..bff2e9d2 100644 + } } diff --git a/src/main/java/net/minecraft/server/EntityFallingBlock.java b/src/main/java/net/minecraft/server/EntityFallingBlock.java -index e64722f6..6683f7c5 100644 +index e64722f63b..6683f7c5f3 100644 --- a/src/main/java/net/minecraft/server/EntityFallingBlock.java +++ b/src/main/java/net/minecraft/server/EntityFallingBlock.java @@ -233,6 +233,15 @@ public class EntityFallingBlock extends Entity { @@ -50,5 +50,5 @@ index e64722f6..6683f7c5 100644 if (nbttagcompound.hasKeyOfType("HurtEntities", 99)) { this.hurtEntities = nbttagcompound.getBoolean("HurtEntities"); -- -2.25.1.windows.1 +2.26.2 diff --git a/Spigot-Server-Patches/0121-Cache-user-authenticator-threads.patch b/Spigot-Server-Patches/0121-Cache-user-authenticator-threads.patch index 8708b3fbf8..6b6d49677b 100644 --- a/Spigot-Server-Patches/0121-Cache-user-authenticator-threads.patch +++ b/Spigot-Server-Patches/0121-Cache-user-authenticator-threads.patch @@ -1,4 +1,4 @@ -From d024183157b7d965c962d57f18a33172819ac7d7 Mon Sep 17 00:00:00 2001 +From 1b1ff569739b0423592d8e291cf45b52d3b291d0 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/Spigot-Server-Patches/0122-Optimise-removeQueue.patch b/Spigot-Server-Patches/0122-Optimise-removeQueue.patch index edac339a39..efbd200abb 100644 --- a/Spigot-Server-Patches/0122-Optimise-removeQueue.patch +++ b/Spigot-Server-Patches/0122-Optimise-removeQueue.patch @@ -1,11 +1,11 @@ -From 18f68ee880df235c4d6e9a1e180246d93fea96d4 Mon Sep 17 00:00:00 2001 +From a905881b6d8c40a334db33e69861bf12dc6e7e6a 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 c6fd50da..19e72da6 100644 +index c6fd50daa8..19e72da6d9 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 { @@ -66,5 +66,5 @@ index c6fd50da..19e72da6 100644 } -- -2.25.1.windows.1 +2.26.2 diff --git a/Spigot-Server-Patches/0123-Allow-Reloading-of-Command-Aliases.patch b/Spigot-Server-Patches/0123-Allow-Reloading-of-Command-Aliases.patch index 846a939cba..71f6a41100 100644 --- a/Spigot-Server-Patches/0123-Allow-Reloading-of-Command-Aliases.patch +++ b/Spigot-Server-Patches/0123-Allow-Reloading-of-Command-Aliases.patch @@ -1,4 +1,4 @@ -From b8a2b9046bf1c7514f777dac87e094c002a3bd9b Mon Sep 17 00:00:00 2001 +From db3026a6dd32a4b49e38ed655140d043ebd45ed7 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 1c25dc8f..8f7b7e67 100644 +index a27783dcf3..3cb57c3b8c 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -2118,5 +2118,24 @@ public final class CraftServer implements Server { @@ -35,5 +35,5 @@ index 1c25dc8f..8f7b7e67 100644 // Paper end } -- -2.25.1.windows.1 +2.26.2 diff --git a/Spigot-Server-Patches/0124-Add-source-to-PlayerExpChangeEvent.patch b/Spigot-Server-Patches/0124-Add-source-to-PlayerExpChangeEvent.patch index a78130128d..4de41a648f 100644 --- a/Spigot-Server-Patches/0124-Add-source-to-PlayerExpChangeEvent.patch +++ b/Spigot-Server-Patches/0124-Add-source-to-PlayerExpChangeEvent.patch @@ -1,11 +1,11 @@ -From 3f7441f2c620db73c18600e59d423dc37029c462 Mon Sep 17 00:00:00 2001 +From 8abe0015fc29b079610b7534f624dad75b649535 Mon Sep 17 00:00:00 2001 From: AlphaBlend Date: Thu, 8 Sep 2016 08:48:33 -0700 Subject: [PATCH] Add source to PlayerExpChangeEvent diff --git a/src/main/java/net/minecraft/server/EntityExperienceOrb.java b/src/main/java/net/minecraft/server/EntityExperienceOrb.java -index f72bb0c1..0447800d 100644 +index f72bb0c138..0447800d9d 100644 --- a/src/main/java/net/minecraft/server/EntityExperienceOrb.java +++ b/src/main/java/net/minecraft/server/EntityExperienceOrb.java @@ -193,7 +193,7 @@ public class EntityExperienceOrb extends Entity { @@ -18,10 +18,10 @@ index f72bb0c1..0447800d 100644 this.die(); diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -index 2d454a3c..95973558 100644 +index a09de16554..0ed6611ac4 100644 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -@@ -111,6 +111,7 @@ import org.bukkit.entity.ThrownPotion; +@@ -117,6 +117,7 @@ import org.bukkit.entity.ThrownPotion; import org.bukkit.entity.Vehicle; import org.bukkit.entity.Villager; import org.bukkit.entity.Villager.Profession; @@ -29,7 +29,7 @@ index 2d454a3c..95973558 100644 import org.bukkit.event.Cancellable; import org.bukkit.event.Event; import org.bukkit.event.Event.Result; -@@ -1004,6 +1005,17 @@ public class CraftEventFactory { +@@ -1011,6 +1012,17 @@ public class CraftEventFactory { return event; } @@ -48,5 +48,5 @@ index 2d454a3c..95973558 100644 return handleBlockGrowEvent(world, pos, block, 3); } -- -2.25.1.windows.1 +2.26.2 diff --git a/Spigot-Server-Patches/0125-Don-t-let-fishinghooks-use-portals.patch b/Spigot-Server-Patches/0125-Don-t-let-fishinghooks-use-portals.patch index 910a82c113..5b21decd2b 100644 --- a/Spigot-Server-Patches/0125-Don-t-let-fishinghooks-use-portals.patch +++ b/Spigot-Server-Patches/0125-Don-t-let-fishinghooks-use-portals.patch @@ -1,11 +1,11 @@ -From 44c5bb2c6355406dc77de81f8ee0602a9e2e7b71 Mon Sep 17 00:00:00 2001 +From 23fa74cd73f85ca708127c9e169b9bcdfbff76ec 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 7e552f98..2ab877c8 100644 +index 1aade318ef..3b948d0805 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 @@ -18,7 +18,7 @@ index 7e552f98..2ab877c8 100644 public DimensionManager dimension; protected BlockPosition ai; diff --git a/src/main/java/net/minecraft/server/EntityFishingHook.java b/src/main/java/net/minecraft/server/EntityFishingHook.java -index 40bdcf4e..39e3bd37 100644 +index 40bdcf4e75..39e3bd3795 100644 --- a/src/main/java/net/minecraft/server/EntityFishingHook.java +++ b/src/main/java/net/minecraft/server/EntityFishingHook.java @@ -160,6 +160,12 @@ public class EntityFishingHook extends Entity { @@ -35,5 +35,5 @@ index 40bdcf4e..39e3bd37 100644 } -- -2.25.1.windows.1 +2.26.2 diff --git a/Spigot-Server-Patches/0126-Add-ProjectileCollideEvent.patch b/Spigot-Server-Patches/0126-Add-ProjectileCollideEvent.patch index bbd5168db9..27e114b94a 100644 --- a/Spigot-Server-Patches/0126-Add-ProjectileCollideEvent.patch +++ b/Spigot-Server-Patches/0126-Add-ProjectileCollideEvent.patch @@ -1,11 +1,11 @@ -From 4b6652a77776d09cba74b6e19177cdc74bf8a768 Mon Sep 17 00:00:00 2001 +From be379d4bd4b66d56bdb9b87a7ea37f62872c1cbc Mon Sep 17 00:00:00 2001 From: Techcable Date: Fri, 16 Dec 2016 21:25:39 -0600 Subject: [PATCH] Add ProjectileCollideEvent diff --git a/src/main/java/net/minecraft/server/EntityArrow.java b/src/main/java/net/minecraft/server/EntityArrow.java -index 2b14b2c3..634e2bd3 100644 +index 2b14b2c3fa..634e2bd304 100644 --- a/src/main/java/net/minecraft/server/EntityArrow.java +++ b/src/main/java/net/minecraft/server/EntityArrow.java @@ -187,6 +187,17 @@ public abstract class EntityArrow extends Entity implements IProjectile { @@ -27,7 +27,7 @@ index 2b14b2c3..634e2bd3 100644 this.a((MovingObjectPosition) object); this.impulse = true; diff --git a/src/main/java/net/minecraft/server/EntityFireball.java b/src/main/java/net/minecraft/server/EntityFireball.java -index 078cc252..6756c79b 100644 +index 078cc25231..6756c79b31 100644 --- a/src/main/java/net/minecraft/server/EntityFireball.java +++ b/src/main/java/net/minecraft/server/EntityFireball.java @@ -67,7 +67,16 @@ public abstract class EntityFireball extends Entity { @@ -49,7 +49,7 @@ index 078cc252..6756c79b 100644 // CraftBukkit start - Fire ProjectileHitEvent diff --git a/src/main/java/net/minecraft/server/EntityFishingHook.java b/src/main/java/net/minecraft/server/EntityFishingHook.java -index 39e3bd37..807ec339 100644 +index 39e3bd3795..807ec3394d 100644 --- a/src/main/java/net/minecraft/server/EntityFishingHook.java +++ b/src/main/java/net/minecraft/server/EntityFishingHook.java @@ -214,7 +214,16 @@ public class EntityFishingHook extends Entity { @@ -71,7 +71,7 @@ index 39e3bd37..807ec339 100644 if (movingobjectposition.getType() == MovingObjectPosition.EnumMovingObjectType.ENTITY) { this.hooked = ((MovingObjectPositionEntity) movingobjectposition).getEntity(); diff --git a/src/main/java/net/minecraft/server/EntityProjectile.java b/src/main/java/net/minecraft/server/EntityProjectile.java -index 2e4c9d42..724b78b5 100644 +index 2e4c9d4267..724b78b5d2 100644 --- a/src/main/java/net/minecraft/server/EntityProjectile.java +++ b/src/main/java/net/minecraft/server/EntityProjectile.java @@ -99,7 +99,16 @@ public abstract class EntityProjectile extends Entity implements IProjectile { @@ -93,10 +93,10 @@ index 2e4c9d42..724b78b5 100644 this.c(((MovingObjectPositionBlock) movingobjectposition).getBlockPosition()); } else { diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -index 95973558..c45b7c15 100644 +index 0ed6611ac4..e6d4f7a06b 100644 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -@@ -1149,6 +1149,16 @@ public class CraftEventFactory { +@@ -1156,6 +1156,16 @@ public class CraftEventFactory { return CraftItemStack.asNMSCopy(bitem); } @@ -114,5 +114,5 @@ index 95973558..c45b7c15 100644 Projectile bukkitEntity = (Projectile) entity.getBukkitEntity(); ProjectileLaunchEvent event = new ProjectileLaunchEvent(bukkitEntity); -- -2.25.1.windows.1 +2.26.2 diff --git a/Spigot-Server-Patches/0127-Prevent-Pathfinding-out-of-World-Border.patch b/Spigot-Server-Patches/0127-Prevent-Pathfinding-out-of-World-Border.patch index e1cf96c4a4..f58d711ed5 100644 --- a/Spigot-Server-Patches/0127-Prevent-Pathfinding-out-of-World-Border.patch +++ b/Spigot-Server-Patches/0127-Prevent-Pathfinding-out-of-World-Border.patch @@ -1,4 +1,4 @@ -From f32384944ebec3c10e236bf563648fd6cf5f1c4e Mon Sep 17 00:00:00 2001 +From 0e1a904edeb60437632d29dcd1a6e4a83dc6c5f9 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 @@ -6,7 +6,7 @@ Subject: [PATCH] Prevent Pathfinding out of World Border This prevents Entities from trying to run outside of the World Border diff --git a/src/main/java/net/minecraft/server/NavigationAbstract.java b/src/main/java/net/minecraft/server/NavigationAbstract.java -index 39a0c45b..bdd092e4 100644 +index 39a0c45bb0..bdd092e49d 100644 --- a/src/main/java/net/minecraft/server/NavigationAbstract.java +++ b/src/main/java/net/minecraft/server/NavigationAbstract.java @@ -123,7 +123,7 @@ public abstract class NavigationAbstract { @@ -19,5 +19,5 @@ index 39a0c45b..bdd092e4 100644 if (!copiedSet) { copiedSet = true; -- -2.25.1.windows.1 +2.26.2 diff --git a/Spigot-Server-Patches/0128-Optimize-World.isLoaded-BlockPosition-Z.patch b/Spigot-Server-Patches/0128-Optimize-World.isLoaded-BlockPosition-Z.patch index f9f61c6bac..7da8fa61b2 100644 --- a/Spigot-Server-Patches/0128-Optimize-World.isLoaded-BlockPosition-Z.patch +++ b/Spigot-Server-Patches/0128-Optimize-World.isLoaded-BlockPosition-Z.patch @@ -1,4 +1,4 @@ -From 5f3c851b5a2ad7a219d45ad5d680c85c8fb4b92a Mon Sep 17 00:00:00 2001 +From 7228c835c503f73c39a3ceb9e4e9be0543e7aa2f 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 86de3c63..96328395 100644 +index 86de3c634d..9632839598 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -224,6 +224,11 @@ public abstract class World implements GeneratorAccess, AutoCloseable { @@ -22,5 +22,5 @@ index 86de3c63..96328395 100644 return getWorldBorder().isInBounds(blockposition) && getChunkIfLoadedImmediately(blockposition.getX() >> 4, blockposition.getZ() >> 4) != null; } -- -2.25.1.windows.1 +2.26.2 diff --git a/Spigot-Server-Patches/0129-Bound-Treasure-Maps-to-World-Border.patch b/Spigot-Server-Patches/0129-Bound-Treasure-Maps-to-World-Border.patch index 9f6d212b22..788ca8ff0a 100644 --- a/Spigot-Server-Patches/0129-Bound-Treasure-Maps-to-World-Border.patch +++ b/Spigot-Server-Patches/0129-Bound-Treasure-Maps-to-World-Border.patch @@ -1,4 +1,4 @@ -From 92063b53c457ea12dd4f9d3fa3f1c571391312f0 Mon Sep 17 00:00:00 2001 +From 00ace7e06a151758f29a76ccb6a96735d94f1ced 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 0f248b6d..e8ce2ecf 100644 +index 0f248b6de3..e8ce2ecf23 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 0f248b6d..e8ce2ecf 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 4ee13ac4..5f10c433 100644 +index 4ee13ac454..5f10c4338e 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 4ee13ac4..5f10c433 100644 return (double) chunkcoordintpair.f() > this.c() && (double) chunkcoordintpair.d() < this.e() && (double) chunkcoordintpair.g() > this.d() && (double) chunkcoordintpair.e() < this.f(); } -- -2.25.1.windows.1 +2.26.2 diff --git a/Spigot-Server-Patches/0130-Configurable-Cartographer-Treasure-Maps.patch b/Spigot-Server-Patches/0130-Configurable-Cartographer-Treasure-Maps.patch index 219c821bb2..d89549929b 100644 --- a/Spigot-Server-Patches/0130-Configurable-Cartographer-Treasure-Maps.patch +++ b/Spigot-Server-Patches/0130-Configurable-Cartographer-Treasure-Maps.patch @@ -1,4 +1,4 @@ -From 87b159cec63df0af8d0d0262d74110d0d5ce0633 Mon Sep 17 00:00:00 2001 +From 7e84f51a74528165304c030d5ce13751d5db6ddd Mon Sep 17 00:00:00 2001 From: Aikar Date: Tue, 20 Dec 2016 15:26:27 -0500 Subject: [PATCH] Configurable Cartographer Treasure Maps @@ -9,7 +9,7 @@ Also allow turning off treasure maps all together as they can eat up Map ID's which are limited in quantity. diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index bff2e9d2..f164844f 100644 +index bff2e9d26d..f164844f33 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java @@ -312,4 +312,14 @@ public class PaperWorldConfig { @@ -28,7 +28,7 @@ index bff2e9d2..f164844f 100644 + } } diff --git a/src/main/java/net/minecraft/server/VillagerTrades.java b/src/main/java/net/minecraft/server/VillagerTrades.java -index 3bcf0b38..4764ffef 100644 +index 3bcf0b385d..4764ffef77 100644 --- a/src/main/java/net/minecraft/server/VillagerTrades.java +++ b/src/main/java/net/minecraft/server/VillagerTrades.java @@ -92,7 +92,8 @@ public class VillagerTrades { @@ -42,5 +42,5 @@ index 3bcf0b38..4764ffef 100644 if (blockposition != null) { ItemStack itemstack = ItemWorldMap.createFilledMapView(worldserver, blockposition.getX(), blockposition.getZ(), (byte) 2, true, true); -- -2.25.1.windows.1 +2.26.2 diff --git a/Spigot-Server-Patches/0131-Optimize-ItemStack.isEmpty.patch b/Spigot-Server-Patches/0131-Optimize-ItemStack.isEmpty.patch index dba4e95027..a4dc09376c 100644 --- a/Spigot-Server-Patches/0131-Optimize-ItemStack.isEmpty.patch +++ b/Spigot-Server-Patches/0131-Optimize-ItemStack.isEmpty.patch @@ -1,4 +1,4 @@ -From 7ecd6cb56b0a0291549a49f25190e3c4bc864f82 Mon Sep 17 00:00:00 2001 +From 60d3f0e9a0e8537ae6b7b3f99977001d91157a19 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 db11c8ec..854cffe6 100644 +index db11c8ec69..854cffe6c9 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 db11c8ec..854cffe6 100644 public ItemStack cloneAndSubtract(int i) { -- -2.25.1.windows.1 +2.26.2 diff --git a/Spigot-Server-Patches/0132-Add-API-methods-to-control-if-armour-stands-can-move.patch b/Spigot-Server-Patches/0132-Add-API-methods-to-control-if-armour-stands-can-move.patch index e1f181b7f8..3239816a59 100644 --- a/Spigot-Server-Patches/0132-Add-API-methods-to-control-if-armour-stands-can-move.patch +++ b/Spigot-Server-Patches/0132-Add-API-methods-to-control-if-armour-stands-can-move.patch @@ -1,11 +1,11 @@ -From 4da20ed499a4b6ec5a8ba5364d0ae240a39c46d2 Mon Sep 17 00:00:00 2001 +From 86b880de6662f3ddeb6baba22b844ff78a0d40e1 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 ed6092f6..176af6c8 100644 +index ed6092f65a..176af6c889 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 ed6092f6..176af6c8 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 2b66a08a..124c3185 100644 +index 2b66a08ade..124c3185bc 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 2b66a08a..124c3185 100644 + // Paper end } -- -2.25.1.windows.1 +2.26.2 diff --git a/Spigot-Server-Patches/0133-Properly-fix-item-duplication-bug.patch b/Spigot-Server-Patches/0133-Properly-fix-item-duplication-bug.patch index 1a8c0e61f5..a8e459188d 100644 --- a/Spigot-Server-Patches/0133-Properly-fix-item-duplication-bug.patch +++ b/Spigot-Server-Patches/0133-Properly-fix-item-duplication-bug.patch @@ -1,4 +1,4 @@ -From 3ed83061fe445107606b214a89065e6e891b90e8 Mon Sep 17 00:00:00 2001 +From 4d9d231abd06072ffbb2009b888d49a3bab160a9 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 diff --git a/Spigot-Server-Patches/0134-String-based-Action-Bar-API.patch b/Spigot-Server-Patches/0134-String-based-Action-Bar-API.patch index e597dff69f..2746345051 100644 --- a/Spigot-Server-Patches/0134-String-based-Action-Bar-API.patch +++ b/Spigot-Server-Patches/0134-String-based-Action-Bar-API.patch @@ -1,11 +1,11 @@ -From 6c1d5b081a6dfd1aef3ca4bdf9d242e07153fa1a Mon Sep 17 00:00:00 2001 +From 70269c1864d6ea0b5b7743546690de9f4894cfe4 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 diff --git a/src/main/java/net/minecraft/server/MCUtil.java b/src/main/java/net/minecraft/server/MCUtil.java -index 9fb9a96c..48f88eab 100644 +index 9fb9a96ccb..48f88eaba4 100644 --- a/src/main/java/net/minecraft/server/MCUtil.java +++ b/src/main/java/net/minecraft/server/MCUtil.java @@ -2,6 +2,7 @@ package net.minecraft.server; @@ -42,7 +42,7 @@ index 9fb9a96c..48f88eab 100644 public static boolean isMainThread() { return MinecraftServer.getServer().isMainThread(); diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index 060a2184..d1745c4e 100644 +index 764a8ef952..d349f0c87b 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -216,6 +216,18 @@ public class CraftPlayer extends CraftHumanEntity implements Player { @@ -65,5 +65,5 @@ index 060a2184..d1745c4e 100644 public void setPlayerListHeaderFooter(BaseComponent[] header, BaseComponent[] footer) { if (header != null) { -- -2.25.1.windows.1 +2.26.2 diff --git a/Spigot-Server-Patches/0135-Firework-API-s.patch b/Spigot-Server-Patches/0135-Firework-API-s.patch index 349146a620..0e6e6d6202 100644 --- a/Spigot-Server-Patches/0135-Firework-API-s.patch +++ b/Spigot-Server-Patches/0135-Firework-API-s.patch @@ -1,11 +1,11 @@ -From 852ef08c9fa8869fe5b5c23ca304870633b2a13b Mon Sep 17 00:00:00 2001 +From 092b2b08642f45676a922bffd5f25beb8853ad11 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 4f51b9b6..278ef79d 100644 +index 4f51b9b654..278ef79d89 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 4f51b9b6..278ef79d 100644 @Override diff --git a/src/main/java/net/minecraft/server/ItemCrossbow.java b/src/main/java/net/minecraft/server/ItemCrossbow.java -index 313076d6..7be41c86 100644 +index 313076d6d8..7be41c8698 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,7 +65,7 @@ index 313076d6..7be41c86 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 058c016b..92dac35e 100644 +index 058c016b7b..92dac35ec4 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 { @@ -90,7 +90,7 @@ index 058c016b..92dac35e 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 75604dbc..98deaba1 100644 +index 75604dbc69..98deaba12c 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 75604dbc..98deaba1 100644 } diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftFirework.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftFirework.java -index 475b7b00..de74e721 100644 +index 475b7b004b..de74e7214a 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 475b7b00..de74e721 100644 + // Paper end } -- -2.25.1.windows.1 +2.26.2 diff --git a/Spigot-Server-Patches/0136-PlayerTeleportEndGatewayEvent.patch b/Spigot-Server-Patches/0136-PlayerTeleportEndGatewayEvent.patch index 2afda9fada..4ef8f7fee6 100644 --- a/Spigot-Server-Patches/0136-PlayerTeleportEndGatewayEvent.patch +++ b/Spigot-Server-Patches/0136-PlayerTeleportEndGatewayEvent.patch @@ -1,4 +1,4 @@ -From 7bbf507c90412fdf8acd6d7e158d2a98ead54452 Mon Sep 17 00:00:00 2001 +From 34f72c9416eb31d88837ed4065faa9c94e8f1d9a 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 b907a3c4..78fba793 100644 +index b907a3c4d8..78fba79378 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 b907a3c4..78fba793 100644 if (teleEvent.isCancelled()) { return; -- -2.25.1.windows.1 +2.26.2 diff --git a/Spigot-Server-Patches/0137-Provide-E-TE-Chunk-count-stat-methods.patch b/Spigot-Server-Patches/0137-Provide-E-TE-Chunk-count-stat-methods.patch index 52479d4aa3..1068e8d6c8 100644 --- a/Spigot-Server-Patches/0137-Provide-E-TE-Chunk-count-stat-methods.patch +++ b/Spigot-Server-Patches/0137-Provide-E-TE-Chunk-count-stat-methods.patch @@ -1,4 +1,4 @@ -From 90524519681bd794aaa137bdeb4cc051e3d78717 Mon Sep 17 00:00:00 2001 +From fbd5facd1e525a2128a68af57d7dfd527b47006b 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 16b78bd0..c06b10c6 100644 +index 3f420be58a..32e96bc057 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java @@ -278,6 +278,48 @@ public class CraftWorld implements World { @@ -60,5 +60,5 @@ index 16b78bd0..c06b10c6 100644 public CraftWorld(WorldServer world, ChunkGenerator gen, Environment env) { -- -2.25.1.windows.1 +2.26.2 diff --git a/Spigot-Server-Patches/0138-Enforce-Sync-Player-Saves.patch b/Spigot-Server-Patches/0138-Enforce-Sync-Player-Saves.patch index 321856a3ac..7e21241ac1 100644 --- a/Spigot-Server-Patches/0138-Enforce-Sync-Player-Saves.patch +++ b/Spigot-Server-Patches/0138-Enforce-Sync-Player-Saves.patch @@ -1,4 +1,4 @@ -From 3a6c017d5a8ef4b9fb510297cb3b5db3c3deb413 Mon Sep 17 00:00:00 2001 +From bc31fa9fd6d8ac4e68e16e61766ec8da84b32360 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 643e5883..29325198 100644 +index 643e588394..2932519886 100644 --- a/src/main/java/net/minecraft/server/PlayerList.java +++ b/src/main/java/net/minecraft/server/PlayerList.java @@ -918,11 +918,13 @@ public abstract class PlayerList { @@ -25,5 +25,5 @@ index 643e5883..29325198 100644 public WhiteList getWhitelist() { -- -2.25.1.windows.1 +2.26.2 diff --git a/Spigot-Server-Patches/0139-Don-t-allow-entities-to-ride-themselves-572.patch b/Spigot-Server-Patches/0139-Don-t-allow-entities-to-ride-themselves-572.patch index a632b512ef..a0c4f52868 100644 --- a/Spigot-Server-Patches/0139-Don-t-allow-entities-to-ride-themselves-572.patch +++ b/Spigot-Server-Patches/0139-Don-t-allow-entities-to-ride-themselves-572.patch @@ -1,11 +1,11 @@ -From b891916ae62c25ff68a788e8c226d34a92059e1a Mon Sep 17 00:00:00 2001 +From e0021ddac8496e7b8997332ed030e3733ce7e909 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 2ab877c8..1c8958d1 100644 +index 3b948d0805..3b02a65ba2 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java @@ -2029,6 +2029,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke @@ -17,5 +17,5 @@ index 2ab877c8..1c8958d1 100644 throw new IllegalStateException("Use x.startRiding(y), not y.addPassenger(x)"); } else { -- -2.25.1.windows.1 +2.26.2 diff --git a/Spigot-Server-Patches/0140-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch b/Spigot-Server-Patches/0140-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch index 3a550fe5f1..ae616ba652 100644 --- a/Spigot-Server-Patches/0140-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch +++ b/Spigot-Server-Patches/0140-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch @@ -1,4 +1,4 @@ -From 8d57e88e9ef41636970d0422e4f01566a7c06069 Mon Sep 17 00:00:00 2001 +From 750408e59c59503d126a0e02b9809c26172fc8cc 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 @@ -265,10 +265,10 @@ index 8dc47452a4..560e2f42b7 100644 } diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -index 342cf7be8a..e66c97ba9c 100644 +index 32e96bc057..265af7ac7f 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -@@ -1801,7 +1801,7 @@ public class CraftWorld implements World { +@@ -1799,7 +1799,7 @@ public class CraftWorld implements World { } else if (TNTPrimed.class.isAssignableFrom(clazz)) { entity = new EntityTNTPrimed(world, x, y, z, null); } else if (ExperienceOrb.class.isAssignableFrom(clazz)) { diff --git a/Spigot-Server-Patches/0141-Cap-Entity-Collisions.patch b/Spigot-Server-Patches/0141-Cap-Entity-Collisions.patch index 72338d5569..27352b22d5 100644 --- a/Spigot-Server-Patches/0141-Cap-Entity-Collisions.patch +++ b/Spigot-Server-Patches/0141-Cap-Entity-Collisions.patch @@ -1,4 +1,4 @@ -From b22dd2c697e51dfe9dfc7e94eab83868025cc088 Mon Sep 17 00:00:00 2001 +From a1ec5a8f6f55ddcb50322130ad363eab26c9ad85 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sun, 22 Jan 2017 18:07:56 -0500 Subject: [PATCH] Cap Entity Collisions diff --git a/Spigot-Server-Patches/0142-Remove-CraftScheduler-Async-Task-Debugger.patch b/Spigot-Server-Patches/0142-Remove-CraftScheduler-Async-Task-Debugger.patch index 8b7deeeeba..07a76cbfa9 100644 --- a/Spigot-Server-Patches/0142-Remove-CraftScheduler-Async-Task-Debugger.patch +++ b/Spigot-Server-Patches/0142-Remove-CraftScheduler-Async-Task-Debugger.patch @@ -1,4 +1,4 @@ -From fafb25d0ff1ed933e8e50cd37e1f4923cc3f6814 Mon Sep 17 00:00:00 2001 +From a35f6e41f024a41879cc8e4336d92a1fd8c6ce88 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 diff --git a/Spigot-Server-Patches/0143-Make-targetSize-more-aggressive-in-the-chunk-unload-.patch b/Spigot-Server-Patches/0143-Make-targetSize-more-aggressive-in-the-chunk-unload-.patch index 82a8340408..49fce774e5 100644 --- a/Spigot-Server-Patches/0143-Make-targetSize-more-aggressive-in-the-chunk-unload-.patch +++ b/Spigot-Server-Patches/0143-Make-targetSize-more-aggressive-in-the-chunk-unload-.patch @@ -1,11 +1,11 @@ -From eaa90acb05f14ba3176d728f736c30c4494c5705 Mon Sep 17 00:00:00 2001 +From 2e0c912fa929d7d6fffe7cc9da9c1027eff4ac03 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 291c2a17..936fc4f6 100644 +index a79e4cef4a..a851997e5f 100644 --- a/src/main/java/net/minecraft/server/PlayerChunkMap.java +++ b/src/main/java/net/minecraft/server/PlayerChunkMap.java @@ -139,7 +139,7 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d { @@ -37,5 +37,5 @@ index 291c2a17..936fc4f6 100644 } -- -2.25.1.windows.1 +2.26.2 diff --git a/Spigot-Server-Patches/0144-Do-not-let-armorstands-drown.patch b/Spigot-Server-Patches/0144-Do-not-let-armorstands-drown.patch index 97cbb50fb9..71e5766816 100644 --- a/Spigot-Server-Patches/0144-Do-not-let-armorstands-drown.patch +++ b/Spigot-Server-Patches/0144-Do-not-let-armorstands-drown.patch @@ -1,11 +1,11 @@ -From 737330b3c9fdebf2fd564107b78244f1aa0a0763 Mon Sep 17 00:00:00 2001 +From 7ec60a5af380c5e04364415e3b8d9f7ca0e4cace 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 176af6c8..992d7bfb 100644 +index 176af6c889..992d7bfb0f 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 176af6c8..992d7bfb 100644 // Paper end } diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java -index 74de19bb..b31355f2 100644 +index 639d113de3..e6b48cc0ea 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 74de19bb..b31355f2 100644 if (this.getAirTicks() == -20) { this.setAirTicks(0); -- -2.25.1.windows.1 +2.26.2 diff --git a/Spigot-Server-Patches/0145-Properly-handle-async-calls-to-restart-the-server.patch b/Spigot-Server-Patches/0145-Properly-handle-async-calls-to-restart-the-server.patch index 0f8147a433..8645845407 100644 --- a/Spigot-Server-Patches/0145-Properly-handle-async-calls-to-restart-the-server.patch +++ b/Spigot-Server-Patches/0145-Properly-handle-async-calls-to-restart-the-server.patch @@ -1,4 +1,4 @@ -From 85980c624cc37bb702630bb277ea5b1e43362a1f Mon Sep 17 00:00:00 2001 +From 260deda1f274cc80fd7c887f953d6d30a35ea578 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 ebb41f78..af2fa93d 100644 +index 35d31a9c36..8d6a089007 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 diff --git a/Spigot-Server-Patches/0147-Add-option-to-make-parrots-stay-on-shoulders-despite.patch b/Spigot-Server-Patches/0147-Add-option-to-make-parrots-stay-on-shoulders-despite.patch index 7ae49f5213..4f8e433f2e 100644 --- a/Spigot-Server-Patches/0147-Add-option-to-make-parrots-stay-on-shoulders-despite.patch +++ b/Spigot-Server-Patches/0147-Add-option-to-make-parrots-stay-on-shoulders-despite.patch @@ -1,4 +1,4 @@ -From 6f6338882a15f56648c1ea8c9098019162efd864 Mon Sep 17 00:00:00 2001 +From 9e36c2094cacd51abb15815246f4b43306e42378 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 @@ -11,7 +11,7 @@ I suspect Mojang may switch to this behavior before full release. To be converted into a Paper-API event at some point in the future? diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index 751551f1..eae1690c 100644 +index 751551f173..eae1690cc6 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java @@ -328,4 +328,10 @@ public class PaperWorldConfig { @@ -26,7 +26,7 @@ index 751551f1..eae1690c 100644 + } } diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java -index b407d80a..5e92f0dd 100644 +index 0e8ba05455..ad79e4521c 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 { @@ -39,7 +39,7 @@ index b407d80a..5e92f0dd 100644 } diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java -index f367a76e..046ef418 100644 +index f367a76e82..046ef418f8 100644 --- a/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java @@ -1773,6 +1773,13 @@ public class PlayerConnection implements PacketListenerPlayIn { @@ -57,5 +57,5 @@ index f367a76e..046ef418 100644 case RELEASE_SHIFT_KEY: this.player.setSneaking(false); -- -2.25.1.windows.1 +2.26.2 diff --git a/Spigot-Server-Patches/0148-Add-configuration-option-to-prevent-player-names-fro.patch b/Spigot-Server-Patches/0148-Add-configuration-option-to-prevent-player-names-fro.patch index 01348fa0ee..763ef23e46 100644 --- a/Spigot-Server-Patches/0148-Add-configuration-option-to-prevent-player-names-fro.patch +++ b/Spigot-Server-Patches/0148-Add-configuration-option-to-prevent-player-names-fro.patch @@ -1,4 +1,4 @@ -From d191de1047b34bea36c01e3fc862b9ff3b352822 Mon Sep 17 00:00:00 2001 +From 3e406ea2d3a38c88264fe49a53fd4e70952226aa 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 5a83fc21..295b8390 100644 +index 5a83fc21cb..295b8390cb 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 5a83fc21..295b8390 100644 + } } diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 8f7b7e67..2e0f443d 100644 +index 3cb57c3b8c..9eb4acf93c 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -2137,5 +2137,10 @@ public final class CraftServer implements Server { @@ -35,5 +35,5 @@ index 8f7b7e67..2e0f443d 100644 // Paper end } -- -2.25.1.windows.1 +2.26.2 diff --git a/Spigot-Server-Patches/0149-Use-TerminalConsoleAppender-for-console-improvements.patch b/Spigot-Server-Patches/0149-Use-TerminalConsoleAppender-for-console-improvements.patch index 315d7b319d..571f89a224 100644 --- a/Spigot-Server-Patches/0149-Use-TerminalConsoleAppender-for-console-improvements.patch +++ b/Spigot-Server-Patches/0149-Use-TerminalConsoleAppender-for-console-improvements.patch @@ -1,4 +1,4 @@ -From 59e4449df98724b0bfcbad09b02ebbb6ef4a2b36 Mon Sep 17 00:00:00 2001 +From e85a62542d8c3b655573da398360b9eb03bf297a 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 @@ -285,7 +285,7 @@ index 9eb4acf93c..681a84e5b3 100644 @Override public PluginCommand getPluginCommand(String name) { diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java -index f9d07e5ca7..9fdad34bb8 100644 +index afbe711acb..fc07fdb590 100644 --- a/src/main/java/org/bukkit/craftbukkit/Main.java +++ b/src/main/java/org/bukkit/craftbukkit/Main.java @@ -13,7 +13,7 @@ import java.util.logging.Logger; diff --git a/Spigot-Server-Patches/0150-provide-a-configurable-option-to-disable-creeper-lin.patch b/Spigot-Server-Patches/0150-provide-a-configurable-option-to-disable-creeper-lin.patch index 5fc274c36a..f4e8888d2d 100644 --- a/Spigot-Server-Patches/0150-provide-a-configurable-option-to-disable-creeper-lin.patch +++ b/Spigot-Server-Patches/0150-provide-a-configurable-option-to-disable-creeper-lin.patch @@ -1,4 +1,4 @@ -From a45b8bf015a8d91a39b9780f11c6511dacfe3637 Mon Sep 17 00:00:00 2001 +From d7053f8d253427e736355b66282d61f9ef034903 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 @@ -6,7 +6,7 @@ Subject: [PATCH] provide a configurable option to disable creeper lingering diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index eae1690c..39ab5457 100644 +index eae1690cc6..39ab545756 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java @@ -334,4 +334,10 @@ public class PaperWorldConfig { @@ -21,7 +21,7 @@ index eae1690c..39ab5457 100644 + } } diff --git a/src/main/java/net/minecraft/server/EntityCreeper.java b/src/main/java/net/minecraft/server/EntityCreeper.java -index cc9887d0..374cf28f 100644 +index cc9887d040..374cf28fb4 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 { @@ -34,5 +34,5 @@ index cc9887d0..374cf28f 100644 entityareaeffectcloud.setSource(this); // CraftBukkit -- -2.25.1.windows.1 +2.26.2 diff --git a/Spigot-Server-Patches/0151-Item-canEntityPickup.patch b/Spigot-Server-Patches/0151-Item-canEntityPickup.patch index b2f035192d..d9c64d9aa5 100644 --- a/Spigot-Server-Patches/0151-Item-canEntityPickup.patch +++ b/Spigot-Server-Patches/0151-Item-canEntityPickup.patch @@ -1,11 +1,11 @@ -From d86bb78367bcdc30f3c49eea150c3d4dcf0562e7 Mon Sep 17 00:00:00 2001 +From e06f91d4710249f1c61283faa5d93f5495654e20 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 1732c1ae..b5816dc8 100644 +index 1732c1ae95..b5816dc89e 100644 --- a/src/main/java/net/minecraft/server/EntityInsentient.java +++ b/src/main/java/net/minecraft/server/EntityInsentient.java @@ -521,6 +521,11 @@ public abstract class EntityInsentient extends EntityLiving { @@ -21,7 +21,7 @@ index 1732c1ae..b5816dc8 100644 } } diff --git a/src/main/java/net/minecraft/server/EntityItem.java b/src/main/java/net/minecraft/server/EntityItem.java -index 208dad2a..97c6a8b6 100644 +index 208dad2a34..97c6a8b6bd 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 208dad2a..97c6a8b6 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 cc593fbc..3f552b59 100644 +index cc593fbc99..3f552b5905 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 cc593fbc..3f552b59 100644 public String toString() { return "CraftItem"; -- -2.25.1.windows.1 +2.26.2 diff --git a/Spigot-Server-Patches/0152-PlayerPickupItemEvent-setFlyAtPlayer.patch b/Spigot-Server-Patches/0152-PlayerPickupItemEvent-setFlyAtPlayer.patch index 23485e97fa..6a33ad3e8f 100644 --- a/Spigot-Server-Patches/0152-PlayerPickupItemEvent-setFlyAtPlayer.patch +++ b/Spigot-Server-Patches/0152-PlayerPickupItemEvent-setFlyAtPlayer.patch @@ -1,11 +1,11 @@ -From 720969ab4cf22fb90dca8adf498dfc3aa28ef74b Mon Sep 17 00:00:00 2001 +From 53311c76dc151e2ae27c847de84b8d0b659ba2d2 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 97c6a8b6..8747dc70 100644 +index 97c6a8b6bd..8747dc7075 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 97c6a8b6..8747dc70 100644 this.die(); itemstack.setCount(i); -- -2.25.1.windows.1 +2.26.2 diff --git a/Spigot-Server-Patches/0153-PlayerAttemptPickupItemEvent.patch b/Spigot-Server-Patches/0153-PlayerAttemptPickupItemEvent.patch index f8e5fb84f3..e8b3540a0c 100644 --- a/Spigot-Server-Patches/0153-PlayerAttemptPickupItemEvent.patch +++ b/Spigot-Server-Patches/0153-PlayerAttemptPickupItemEvent.patch @@ -1,11 +1,11 @@ -From d6e4a66af39be2c669eaaef75688ead046456760 Mon Sep 17 00:00:00 2001 +From 560e77d7536fa930419acb3e9980b309f16e4cf3 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 8747dc70..5efcc50a 100644 +index 8747dc7075..5efcc50ab9 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 8747dc70..5efcc50a 100644 itemstack.setCount(canHold); // Call legacy event -- -2.25.1.windows.1 +2.26.2 diff --git a/Spigot-Server-Patches/0154-Add-UnknownCommandEvent.patch b/Spigot-Server-Patches/0154-Add-UnknownCommandEvent.patch index c54d33fa94..3a55d7fa20 100644 --- a/Spigot-Server-Patches/0154-Add-UnknownCommandEvent.patch +++ b/Spigot-Server-Patches/0154-Add-UnknownCommandEvent.patch @@ -1,4 +1,4 @@ -From 02ec89d2d15e4e57f767626534ee34b0eb6364cf Mon Sep 17 00:00:00 2001 +From 29018764457bdff7ec677bfa8925e0cb61c5d8dd 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/Spigot-Server-Patches/0155-Basic-PlayerProfile-API.patch b/Spigot-Server-Patches/0155-Basic-PlayerProfile-API.patch index a098ad8dfb..7976b24b0c 100644 --- a/Spigot-Server-Patches/0155-Basic-PlayerProfile-API.patch +++ b/Spigot-Server-Patches/0155-Basic-PlayerProfile-API.patch @@ -1,4 +1,4 @@ -From cfa64dcb818cf795dc01a6286ad2d361486a00a0 Mon Sep 17 00:00:00 2001 +From 3a31c71eacf63fb409a1c3dd849652e94f4328bf Mon Sep 17 00:00:00 2001 From: Aikar Date: Mon, 15 Jan 2018 22:11:48 -0500 Subject: [PATCH] Basic PlayerProfile API diff --git a/Spigot-Server-Patches/0156-Shoulder-Entities-Release-API.patch b/Spigot-Server-Patches/0156-Shoulder-Entities-Release-API.patch index 10683263c1..516f8ca34a 100644 --- a/Spigot-Server-Patches/0156-Shoulder-Entities-Release-API.patch +++ b/Spigot-Server-Patches/0156-Shoulder-Entities-Release-API.patch @@ -1,4 +1,4 @@ -From 97246173932ca34fa3a1dd5e095f05988ddbe7a6 Mon Sep 17 00:00:00 2001 +From 4f02fabda4ab3e8b954c01c024df170d79d8db60 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sat, 17 Jun 2017 15:18:30 -0400 Subject: [PATCH] Shoulder Entities Release API diff --git a/Spigot-Server-Patches/0157-Profile-Lookup-Events.patch b/Spigot-Server-Patches/0157-Profile-Lookup-Events.patch index 56f9778755..b857a46b19 100644 --- a/Spigot-Server-Patches/0157-Profile-Lookup-Events.patch +++ b/Spigot-Server-Patches/0157-Profile-Lookup-Events.patch @@ -1,4 +1,4 @@ -From 0b003028c0b8227486c0754b25758d88cb7c3828 Mon Sep 17 00:00:00 2001 +From bb23dca68742aac69f18e6122455492acb85206d 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 3bcdb8f9..bb989431 100644 +index 3bcdb8f93f..bb9894318e 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 3bcdb8f9..bb989431 100644 } } -- -2.25.1.windows.1 +2.26.2 diff --git a/Spigot-Server-Patches/0158-Block-player-logins-during-server-shutdown.patch b/Spigot-Server-Patches/0158-Block-player-logins-during-server-shutdown.patch index 280945d15e..9a4db4ecfc 100644 --- a/Spigot-Server-Patches/0158-Block-player-logins-during-server-shutdown.patch +++ b/Spigot-Server-Patches/0158-Block-player-logins-during-server-shutdown.patch @@ -1,11 +1,11 @@ -From 5cea1f3c04abb99f31437849696d6c764b1aa611 Mon Sep 17 00:00:00 2001 +From 1069f8cbc2aa3496fa4066a32e0574028754a1b1 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 19e72da6..234451eb 100644 +index 19e72da6d9..234451ebc8 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 19e72da6..234451eb 100644 this.c(); } else if (this.g == LoginListener.EnumProtocolState.DELAY_ACCEPT) { -- -2.25.1.windows.1 +2.26.2 diff --git a/Spigot-Server-Patches/0159-Entity-fromMobSpawner.patch b/Spigot-Server-Patches/0159-Entity-fromMobSpawner.patch index e2922266d7..83637aa344 100644 --- a/Spigot-Server-Patches/0159-Entity-fromMobSpawner.patch +++ b/Spigot-Server-Patches/0159-Entity-fromMobSpawner.patch @@ -1,4 +1,4 @@ -From 3b9143d900914d380349848ae519a4386a73a35f Mon Sep 17 00:00:00 2001 +From a4999e29e9a71e373ef2d4654d6a80f327db3cb9 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/Spigot-Server-Patches/0160-Improve-the-Saddle-API-for-Horses.patch b/Spigot-Server-Patches/0160-Improve-the-Saddle-API-for-Horses.patch index 29f0aa2073..a7af57ca6c 100644 --- a/Spigot-Server-Patches/0160-Improve-the-Saddle-API-for-Horses.patch +++ b/Spigot-Server-Patches/0160-Improve-the-Saddle-API-for-Horses.patch @@ -1,4 +1,4 @@ -From e361ca221cfcf1aad706043726600535619007db Mon Sep 17 00:00:00 2001 +From 5913f504b1f8cadbbee1a987a3975b5d1d60f9aa 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 09016e35..9952db3e 100644 +index 09016e3547..9952db3eb5 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 09016e35..9952db3e 100644 } } diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryHorse.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryHorse.java -index 63991bf4..9a47a1ad 100644 +index 63991bf4be..9a47a1adc1 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 63991bf4..9a47a1ad 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 00000000..99cfbaf9 +index 0000000000..99cfbaf90b --- /dev/null +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftSaddledInventory.java @@ -0,0 +1,15 @@ @@ -61,5 +61,5 @@ index 00000000..99cfbaf9 + +} -- -2.25.1.windows.1 +2.26.2 diff --git a/Spigot-Server-Patches/0161-Implement-ensureServerConversions-API.patch b/Spigot-Server-Patches/0161-Implement-ensureServerConversions-API.patch index 28e5f06aa1..53e97617ae 100644 --- a/Spigot-Server-Patches/0161-Implement-ensureServerConversions-API.patch +++ b/Spigot-Server-Patches/0161-Implement-ensureServerConversions-API.patch @@ -1,4 +1,4 @@ -From 5e85d280c3172b657231cc60b3dba12471f8f16c Mon Sep 17 00:00:00 2001 +From a98b708ebf3883124461b8a7a17ad5f98f6036e4 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 01ab1943..8b219b5f 100644 +index 01ab19434a..8b219b5fa2 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 01ab1943..8b219b5f 100644 + // Paper end } -- -2.25.1.windows.1 +2.26.2 diff --git a/Spigot-Server-Patches/0162-Implement-getI18NDisplayName.patch b/Spigot-Server-Patches/0162-Implement-getI18NDisplayName.patch index fd22892cda..ebc823e96e 100644 --- a/Spigot-Server-Patches/0162-Implement-getI18NDisplayName.patch +++ b/Spigot-Server-Patches/0162-Implement-getI18NDisplayName.patch @@ -1,4 +1,4 @@ -From b7611f2db448f4fb14eb979adf2212d9283adb3b Mon Sep 17 00:00:00 2001 +From a8b0bfa58103401cf1dc62114d4601d012f4fe1f 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 c0c13798..60127393 100644 +index c0c13798f8..6012739331 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 c0c13798..60127393 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 8b219b5f..23d77564 100644 +index 8b219b5fa2..23d7756456 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 8b219b5f..23d77564 100644 // Paper end } -- -2.25.1.windows.1 +2.26.2 diff --git a/Spigot-Server-Patches/0163-ProfileWhitelistVerifyEvent.patch b/Spigot-Server-Patches/0163-ProfileWhitelistVerifyEvent.patch index 0e59605d09..7703d43462 100644 --- a/Spigot-Server-Patches/0163-ProfileWhitelistVerifyEvent.patch +++ b/Spigot-Server-Patches/0163-ProfileWhitelistVerifyEvent.patch @@ -1,11 +1,11 @@ -From e4cd3b233ea376d63831b573a85821dfa5ad8d9f Mon Sep 17 00:00:00 2001 +From ae80c701bfa1e7ed563e2fedd071e0be89dcb1fa 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 77f1ddc8..a61815c7 100644 +index 77f1ddc8a8..a61815c794 100644 --- a/src/main/java/net/minecraft/server/PlayerList.java +++ b/src/main/java/net/minecraft/server/PlayerList.java @@ -509,9 +509,9 @@ public abstract class PlayerList { @@ -48,5 +48,5 @@ index 77f1ddc8..a61815c7 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.25.1.windows.1 +2.26.2 diff --git a/Spigot-Server-Patches/0164-Fix-this-stupid-bullshit.patch b/Spigot-Server-Patches/0164-Fix-this-stupid-bullshit.patch index e33888ccf6..a7051986f8 100644 --- a/Spigot-Server-Patches/0164-Fix-this-stupid-bullshit.patch +++ b/Spigot-Server-Patches/0164-Fix-this-stupid-bullshit.patch @@ -1,4 +1,4 @@ -From 034e99d1be1c8b2df3db3f7a384666660c369d49 Mon Sep 17 00:00:00 2001 +From 97e95b8cb6b1ae20e64ed0fc6a1e1d9582381b8b 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,7 +9,7 @@ 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 9fdad34bb8..d1bdac6aa9 100644 +index fc07fdb590..bf0a020189 100644 --- a/src/main/java/org/bukkit/craftbukkit/Main.java +++ b/src/main/java/org/bukkit/craftbukkit/Main.java @@ -218,10 +218,12 @@ public class Main { diff --git a/Spigot-Server-Patches/0165-Ocelot-despawns-should-honor-nametags-and-leash.patch b/Spigot-Server-Patches/0165-Ocelot-despawns-should-honor-nametags-and-leash.patch index ffd8c9b856..e2cbcae95f 100644 --- a/Spigot-Server-Patches/0165-Ocelot-despawns-should-honor-nametags-and-leash.patch +++ b/Spigot-Server-Patches/0165-Ocelot-despawns-should-honor-nametags-and-leash.patch @@ -1,11 +1,11 @@ -From 0d3f6d75f7837c2048c4ed5d07861db136f7bb26 Mon Sep 17 00:00:00 2001 +From 3fa3249bc11c300cacaf67f9f9663c226878e702 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 06241145..d9a7b8ac 100644 +index 0624114553..d9a7b8ac1e 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 06241145..d9a7b8ac 100644 @Override -- -2.25.1.windows.1 +2.26.2 diff --git a/Spigot-Server-Patches/0166-Reset-spawner-timer-when-spawner-event-is-cancelled.patch b/Spigot-Server-Patches/0166-Reset-spawner-timer-when-spawner-event-is-cancelled.patch index d387ec74b9..d210f6563e 100644 --- a/Spigot-Server-Patches/0166-Reset-spawner-timer-when-spawner-event-is-cancelled.patch +++ b/Spigot-Server-Patches/0166-Reset-spawner-timer-when-spawner-event-is-cancelled.patch @@ -1,11 +1,11 @@ -From 0a60c7d137249b42e32668e922eba7d6e637ace7 Mon Sep 17 00:00:00 2001 +From 3d66ebaa4dccb0bf6e9a0c73688bb188dc073e73 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 ab5d83d3..c38295a0 100644 +index ab5d83d34d..c38295a09d 100644 --- a/src/main/java/net/minecraft/server/MobSpawnerAbstract.java +++ b/src/main/java/net/minecraft/server/MobSpawnerAbstract.java @@ -142,6 +142,7 @@ public abstract class MobSpawnerAbstract { @@ -26,5 +26,5 @@ index ab5d83d3..c38295a0 100644 } -- -2.25.1.windows.1 +2.26.2 diff --git a/Spigot-Server-Patches/0167-Fix-MC-117075-TE-Unload-Lag-Spike.patch b/Spigot-Server-Patches/0167-Fix-MC-117075-TE-Unload-Lag-Spike.patch index 37f043d79c..92ff908c65 100644 --- a/Spigot-Server-Patches/0167-Fix-MC-117075-TE-Unload-Lag-Spike.patch +++ b/Spigot-Server-Patches/0167-Fix-MC-117075-TE-Unload-Lag-Spike.patch @@ -1,11 +1,11 @@ -From c1379fc6595e8463a7e9c7c27c31f24e1f93868f Mon Sep 17 00:00:00 2001 +From eb3143636afc41b6bbfbc4c93132918ab321de3e 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 96328395..14c97a16 100644 +index 9632839598..14c97a163c 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -647,7 +647,11 @@ public abstract class World implements GeneratorAccess, AutoCloseable { @@ -22,5 +22,5 @@ index 96328395..14c97a16 100644 this.tileEntityListUnload.clear(); } -- -2.25.1.windows.1 +2.26.2 diff --git a/Spigot-Server-Patches/0168-Allow-specifying-a-custom-authentication-servers-dow.patch b/Spigot-Server-Patches/0168-Allow-specifying-a-custom-authentication-servers-dow.patch index abb728bd61..d0924d1c62 100644 --- a/Spigot-Server-Patches/0168-Allow-specifying-a-custom-authentication-servers-dow.patch +++ b/Spigot-Server-Patches/0168-Allow-specifying-a-custom-authentication-servers-dow.patch @@ -1,4 +1,4 @@ -From 9b4d6efc58a480aea2f77b4bc5805ab81571ea64 Mon Sep 17 00:00:00 2001 +From 90b4227188043a36feca8a87e8e5ccf57071caaf 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 295b8390..5884b04f 100644 +index 295b8390cb..5884b04f7e 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 295b8390..5884b04f 100644 + } } diff --git a/src/main/java/net/minecraft/server/LoginListener.java b/src/main/java/net/minecraft/server/LoginListener.java -index 234451eb..758fe774 100644 +index 234451ebc8..758fe77489 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 234451eb..758fe774 100644 LoginListener.LOGGER.error("Couldn't verify username because servers are unavailable"); } -- -2.25.1.windows.1 +2.26.2 diff --git a/Spigot-Server-Patches/0169-LivingEntity-setKiller.patch b/Spigot-Server-Patches/0169-LivingEntity-setKiller.patch index e3809ab975..f3c912ba67 100644 --- a/Spigot-Server-Patches/0169-LivingEntity-setKiller.patch +++ b/Spigot-Server-Patches/0169-LivingEntity-setKiller.patch @@ -1,11 +1,11 @@ -From a1835d11de28874c38029a3b057ee27b6818ad23 Mon Sep 17 00:00:00 2001 +From a324e97a247c4f6d3e2a3cc2db7352bea6ae1c5b 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 b31355f2..c7b62872 100644 +index e6b48cc0ea..88688be668 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 b31355f2..c7b62872 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 e38f4f69..23a48199 100644 +index da86ee4149..1760dfa7a3 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java @@ -318,6 +318,16 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity { @@ -39,5 +39,5 @@ index e38f4f69..23a48199 100644 public boolean addPotionEffect(PotionEffect effect) { return addPotionEffect(effect, false); -- -2.25.1.windows.1 +2.26.2 diff --git a/Spigot-Server-Patches/0170-Use-Log4j-IOStreams-to-redirect-System.out-err-to-lo.patch b/Spigot-Server-Patches/0170-Use-Log4j-IOStreams-to-redirect-System.out-err-to-lo.patch index b3f342b5c5..a5b9fcde71 100644 --- a/Spigot-Server-Patches/0170-Use-Log4j-IOStreams-to-redirect-System.out-err-to-lo.patch +++ b/Spigot-Server-Patches/0170-Use-Log4j-IOStreams-to-redirect-System.out-err-to-lo.patch @@ -1,4 +1,4 @@ -From 6458b9b642b78110256e30abe5116a5353a36180 Mon Sep 17 00:00:00 2001 +From c887b954dc5767cb7ad7963731796a3b1ad4f643 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 diff --git a/Spigot-Server-Patches/0171-Handle-plugin-prefixes-using-Log4J-configuration.patch b/Spigot-Server-Patches/0171-Handle-plugin-prefixes-using-Log4J-configuration.patch index 8789071a97..ba7f15e8c5 100644 --- a/Spigot-Server-Patches/0171-Handle-plugin-prefixes-using-Log4J-configuration.patch +++ b/Spigot-Server-Patches/0171-Handle-plugin-prefixes-using-Log4J-configuration.patch @@ -1,4 +1,4 @@ -From dcdf6b883c4f897b2fffee1863dab10a55e65917 Mon Sep 17 00:00:00 2001 +From a8476f48529b567e1195dbc90c7b68f95e87efdb 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 diff --git a/Spigot-Server-Patches/0172-Include-Log4J2-SLF4J-implementation.patch b/Spigot-Server-Patches/0172-Include-Log4J2-SLF4J-implementation.patch index 2332b1cce3..a66b426220 100644 --- a/Spigot-Server-Patches/0172-Include-Log4J2-SLF4J-implementation.patch +++ b/Spigot-Server-Patches/0172-Include-Log4J2-SLF4J-implementation.patch @@ -1,4 +1,4 @@ -From 139fbd578f28f4442884652552af30d1791f5c95 Mon Sep 17 00:00:00 2001 +From 0e36585d1f1b408791a0e3e25e6c0f833fe97674 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/Spigot-Server-Patches/0173-Disable-logger-prefix-for-various-plugins-bypassing-.patch b/Spigot-Server-Patches/0173-Disable-logger-prefix-for-various-plugins-bypassing-.patch index 3eb53da96a..77fee2f3a5 100644 --- a/Spigot-Server-Patches/0173-Disable-logger-prefix-for-various-plugins-bypassing-.patch +++ b/Spigot-Server-Patches/0173-Disable-logger-prefix-for-various-plugins-bypassing-.patch @@ -1,4 +1,4 @@ -From 660ce1760bc0098207da4b3458e9e4bcccba1ce0 Mon Sep 17 00:00:00 2001 +From d0e8b7108a2a694d0b3177d300ef10f74f773de6 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,7 +11,7 @@ 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 a8bdaaea..a9bb9876 100644 +index a8bdaaeaa1..a9bb987652 100644 --- a/src/main/resources/log4j2.xml +++ b/src/main/resources/log4j2.xml @@ -8,7 +8,8 @@ @@ -35,5 +35,5 @@ index a8bdaaea..a9bb9876 100644 -- -2.25.1.windows.1 +2.26.2 diff --git a/Spigot-Server-Patches/0174-Add-PlayerJumpEvent.patch b/Spigot-Server-Patches/0174-Add-PlayerJumpEvent.patch index 4d7398290d..ede7739ce6 100644 --- a/Spigot-Server-Patches/0174-Add-PlayerJumpEvent.patch +++ b/Spigot-Server-Patches/0174-Add-PlayerJumpEvent.patch @@ -1,11 +1,11 @@ -From b3f78ad92fa558d6b564b0d5c9b33a043e6e37a5 Mon Sep 17 00:00:00 2001 +From ca5bb26513d8ed1ccdd4b8ad854d67edd735b83b 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 046ef418..b0651dcf 100644 +index 046ef418f8..b0651dcfbf 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 046ef418..b0651dcf 100644 this.player.move(EnumMoveType.PLAYER, new Vec3D(d7, d8, d9)); -- -2.25.1.windows.1 +2.26.2 diff --git a/Spigot-Server-Patches/0175-handle-PacketPlayInKeepAlive-async.patch b/Spigot-Server-Patches/0175-handle-PacketPlayInKeepAlive-async.patch index aae6308df4..b1f05cfee7 100644 --- a/Spigot-Server-Patches/0175-handle-PacketPlayInKeepAlive-async.patch +++ b/Spigot-Server-Patches/0175-handle-PacketPlayInKeepAlive-async.patch @@ -1,4 +1,4 @@ -From cd8cd2fea7a78279d7558e213bfd0c2ccee8745e Mon Sep 17 00:00:00 2001 +From e8b912ff90975d3e72ee03929f02f0a97ba4e6de 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 b0651dcf..d4a649a8 100644 +index b0651dcfbf..d4a649a83f 100644 --- a/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java @@ -2487,14 +2487,18 @@ public class PlayerConnection implements PacketListenerPlayIn { @@ -40,5 +40,5 @@ index b0651dcf..d4a649a8 100644 } -- -2.25.1.windows.1 +2.26.2 diff --git a/Spigot-Server-Patches/0176-Expose-client-protocol-version-and-virtual-host.patch b/Spigot-Server-Patches/0176-Expose-client-protocol-version-and-virtual-host.patch index 871a43521c..d6d3c97a86 100644 --- a/Spigot-Server-Patches/0176-Expose-client-protocol-version-and-virtual-host.patch +++ b/Spigot-Server-Patches/0176-Expose-client-protocol-version-and-virtual-host.patch @@ -1,4 +1,4 @@ -From 58ad26ff9c4f0a9dd0b33e00d751122ae46431f5 Mon Sep 17 00:00:00 2001 +From 03c3446ce4ecf5401fce7d14c282a36cffbc4fa6 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 @@ -6,7 +6,7 @@ Subject: [PATCH] Expose client protocol version and virtual host diff --git a/src/main/java/com/destroystokyo/paper/network/PaperNetworkClient.java b/src/main/java/com/destroystokyo/paper/network/PaperNetworkClient.java new file mode 100644 -index 00000000..5caca643 +index 0000000000..5caca6439d --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/network/PaperNetworkClient.java @@ -0,0 +1,50 @@ @@ -61,7 +61,7 @@ index 00000000..5caca643 + +} diff --git a/src/main/java/net/minecraft/server/HandshakeListener.java b/src/main/java/net/minecraft/server/HandshakeListener.java -index d0b9c6e3..8928d93e 100644 +index d0b9c6e3dc..8928d93e49 100644 --- a/src/main/java/net/minecraft/server/HandshakeListener.java +++ b/src/main/java/net/minecraft/server/HandshakeListener.java @@ -15,6 +15,7 @@ public class HandshakeListener implements PacketHandshakingInListener { @@ -84,7 +84,7 @@ index d0b9c6e3..8928d93e 100644 @Override diff --git a/src/main/java/net/minecraft/server/NetworkManager.java b/src/main/java/net/minecraft/server/NetworkManager.java -index 3ccf1663..e2d8ed88 100644 +index 3ccf166366..e2d8ed88f0 100644 --- a/src/main/java/net/minecraft/server/NetworkManager.java +++ b/src/main/java/net/minecraft/server/NetworkManager.java @@ -60,6 +60,10 @@ public class NetworkManager extends SimpleChannelInboundHandler> { @@ -99,7 +99,7 @@ index 3ccf1663..e2d8ed88 100644 public NetworkManager(EnumProtocolDirection enumprotocoldirection) { this.h = enumprotocoldirection; diff --git a/src/main/java/net/minecraft/server/PacketHandshakingInSetProtocol.java b/src/main/java/net/minecraft/server/PacketHandshakingInSetProtocol.java -index 4f008e47..8545146f 100644 +index 4f008e4723..8545146fb1 100644 --- a/src/main/java/net/minecraft/server/PacketHandshakingInSetProtocol.java +++ b/src/main/java/net/minecraft/server/PacketHandshakingInSetProtocol.java @@ -35,6 +35,7 @@ public class PacketHandshakingInSetProtocol implements Packet 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 d4a649a8..2a3771d0 100644 +index d4a649a83f..2a3771d065 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 d4a649a8..2a3771d0 100644 this.minecraftServer.getMethodProfiler().exit(); // CraftBukkit start -- -2.25.1.windows.1 +2.26.2 diff --git a/Spigot-Server-Patches/0178-Send-attack-SoundEffects-only-to-players-who-can-see.patch b/Spigot-Server-Patches/0178-Send-attack-SoundEffects-only-to-players-who-can-see.patch index e950b2fdd8..0e5761fd53 100644 --- a/Spigot-Server-Patches/0178-Send-attack-SoundEffects-only-to-players-who-can-see.patch +++ b/Spigot-Server-Patches/0178-Send-attack-SoundEffects-only-to-players-who-can-see.patch @@ -1,4 +1,4 @@ -From 6ff7e04ed57eaba5dcacbac55ad5d68de9e82eb0 Mon Sep 17 00:00:00 2001 +From 2b55c43eb698c6633bdf520a698a5bae6720711b 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 3bd5ddba..c86d22e7 100644 +index 8e5edd2c9b..542f935b4e 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 3bd5ddba..c86d22e7 100644 entity.extinguish(); } diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index 14c97a16..a956dbc3 100644 +index 14c97a163c..a956dbc3d4 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -584,6 +584,11 @@ public abstract class World implements GeneratorAccess, AutoCloseable { @@ -88,5 +88,5 @@ index 14c97a16..a956dbc3 100644 public abstract void playSound(@Nullable EntityHuman entityhuman, Entity entity, SoundEffect soundeffect, SoundCategory soundcategory, float f, float f1); -- -2.25.1.windows.1 +2.26.2 diff --git a/Spigot-Server-Patches/0179-Option-for-maximum-exp-value-when-merging-orbs.patch b/Spigot-Server-Patches/0179-Option-for-maximum-exp-value-when-merging-orbs.patch index 6ed50486a5..786c33f439 100644 --- a/Spigot-Server-Patches/0179-Option-for-maximum-exp-value-when-merging-orbs.patch +++ b/Spigot-Server-Patches/0179-Option-for-maximum-exp-value-when-merging-orbs.patch @@ -1,11 +1,11 @@ -From 79780ca45f8bce43fbcdd664e0c3ddd5ff0beca5 Mon Sep 17 00:00:00 2001 +From 1393d33b21745550837bf3cc7a82c11b1147b375 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/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index 39ab5457..d2582d98 100644 +index 39ab545756..d2582d981f 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java @@ -340,4 +340,10 @@ public class PaperWorldConfig { @@ -20,10 +20,10 @@ index 39ab5457..d2582d98 100644 + } } diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -index c45b7c15..dbda8b35 100644 +index e6d4f7a06b..ce44dc4292 100644 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -@@ -542,16 +542,32 @@ public class CraftEventFactory { +@@ -549,16 +549,32 @@ public class CraftEventFactory { EntityExperienceOrb xp = (EntityExperienceOrb) entity; double radius = world.spigotConfig.expMerge; if (radius > 0) { @@ -60,5 +60,5 @@ index c45b7c15..dbda8b35 100644 // Spigot end } else if (!(entity instanceof EntityPlayer)) { -- -2.25.1.windows.1 +2.26.2 diff --git a/Spigot-Server-Patches/0180-Add-PlayerArmorChangeEvent.patch b/Spigot-Server-Patches/0180-Add-PlayerArmorChangeEvent.patch index 173bfdbd16..a55f77bfa4 100644 --- a/Spigot-Server-Patches/0180-Add-PlayerArmorChangeEvent.patch +++ b/Spigot-Server-Patches/0180-Add-PlayerArmorChangeEvent.patch @@ -1,4 +1,4 @@ -From 09850a2d79e1345efaa78b0fff440d62f82901fd Mon Sep 17 00:00:00 2001 +From e16ac1056e7e37036a8cbc615d189881d9532047 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/Spigot-Server-Patches/0181-Prevent-logins-from-being-processed-when-the-player-.patch b/Spigot-Server-Patches/0181-Prevent-logins-from-being-processed-when-the-player-.patch index c07ce7b5c2..3d41580ae9 100644 --- a/Spigot-Server-Patches/0181-Prevent-logins-from-being-processed-when-the-player-.patch +++ b/Spigot-Server-Patches/0181-Prevent-logins-from-being-processed-when-the-player-.patch @@ -1,4 +1,4 @@ -From 01a3a6042dd4a983e00627fd7098d0cb6e5a3375 Mon Sep 17 00:00:00 2001 +From 75dd02cfdc3ee1d52e1e6f10878188f716197262 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 758fe774..1fb609dc 100644 +index 758fe77489..1fb609dcfc 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 758fe774..1fb609dc 100644 EntityPlayer entityplayer = this.server.getPlayerList().a(this.i.getId()); -- -2.25.1.windows.1 +2.26.2 diff --git a/Spigot-Server-Patches/0182-use-CB-BlockState-implementations-for-captured-block.patch b/Spigot-Server-Patches/0182-use-CB-BlockState-implementations-for-captured-block.patch index afc896dc92..6137aae46e 100644 --- a/Spigot-Server-Patches/0182-use-CB-BlockState-implementations-for-captured-block.patch +++ b/Spigot-Server-Patches/0182-use-CB-BlockState-implementations-for-captured-block.patch @@ -1,4 +1,4 @@ -From 92d1e8f03547840bcefbbc9f9bc7edd35b521907 Mon Sep 17 00:00:00 2001 +From 1fdf327946f0b6f512ac3316098f628f110a4c8a 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 a956dbc3..2f57c7bc 100644 +index a956dbc3d4..2f57c7bc76 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -66,7 +66,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable { @@ -58,5 +58,5 @@ index a956dbc3..2f57c7bc 100644 return previous.getHandle(); } -- -2.25.1.windows.1 +2.26.2 diff --git a/Spigot-Server-Patches/0183-API-to-get-a-BlockState-without-a-snapshot.patch b/Spigot-Server-Patches/0183-API-to-get-a-BlockState-without-a-snapshot.patch index 6f9ba195b0..3cb8109def 100644 --- a/Spigot-Server-Patches/0183-API-to-get-a-BlockState-without-a-snapshot.patch +++ b/Spigot-Server-Patches/0183-API-to-get-a-BlockState-without-a-snapshot.patch @@ -1,4 +1,4 @@ -From 3cfddc0dc9746e8c19ad37daee39019f1216bb11 Mon Sep 17 00:00:00 2001 +From 85bd82d6140ede4e085017f7c1dded9e3d586dbd 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 diff --git a/Spigot-Server-Patches/0184-AsyncTabCompleteEvent.patch b/Spigot-Server-Patches/0184-AsyncTabCompleteEvent.patch index cebd2a9743..b74802c940 100644 --- a/Spigot-Server-Patches/0184-AsyncTabCompleteEvent.patch +++ b/Spigot-Server-Patches/0184-AsyncTabCompleteEvent.patch @@ -1,4 +1,4 @@ -From 980b864d8aec2d37748ca463cd4b599026129f6d Mon Sep 17 00:00:00 2001 +From 351dde850ad87a0fbd867e53cd5c6a3b888117d9 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sun, 26 Nov 2017 13:19:58 -0500 Subject: [PATCH] AsyncTabCompleteEvent diff --git a/Spigot-Server-Patches/0185-Avoid-NPE-in-PathfinderGoalTempt.patch b/Spigot-Server-Patches/0185-Avoid-NPE-in-PathfinderGoalTempt.patch index 3d2acc70fd..2625e16510 100644 --- a/Spigot-Server-Patches/0185-Avoid-NPE-in-PathfinderGoalTempt.patch +++ b/Spigot-Server-Patches/0185-Avoid-NPE-in-PathfinderGoalTempt.patch @@ -1,11 +1,11 @@ -From 3448dbfbbe909b6309363e11ba5142a39c4b559f Mon Sep 17 00:00:00 2001 +From 3b033ce676ca0316ce058d8fb6088d66cf33cfa5 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 eafdcb91..d37a2fa0 100644 +index eafdcb916a..d37a2fa0ab 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 eafdcb91..d37a2fa0 100644 } } -- -2.25.1.windows.1 +2.26.2 diff --git a/Spigot-Server-Patches/0186-PlayerPickupExperienceEvent.patch b/Spigot-Server-Patches/0186-PlayerPickupExperienceEvent.patch index b4e415b8b5..0588e94bc9 100644 --- a/Spigot-Server-Patches/0186-PlayerPickupExperienceEvent.patch +++ b/Spigot-Server-Patches/0186-PlayerPickupExperienceEvent.patch @@ -1,4 +1,4 @@ -From a1deab71b1071eb4508794a3d294c966c435e0fa Mon Sep 17 00:00:00 2001 +From a85ac33ec798a8cd41925dba5a415515975d0889 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 d4275e73..b3edb69a 100644 +index d4275e733d..b3edb69a96 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 d4275e73..b3edb69a 100644 entityhuman.receive(this, 1); Entry entry = EnchantmentManager.b(Enchantments.MENDING, (EntityLiving) entityhuman); -- -2.25.1.windows.1 +2.26.2 diff --git a/Spigot-Server-Patches/0187-ExperienceOrbMergeEvent.patch b/Spigot-Server-Patches/0187-ExperienceOrbMergeEvent.patch index e7118dbd10..b640c1102b 100644 --- a/Spigot-Server-Patches/0187-ExperienceOrbMergeEvent.patch +++ b/Spigot-Server-Patches/0187-ExperienceOrbMergeEvent.patch @@ -1,4 +1,4 @@ -From 15351f65aacd707684c22266856d744f098de87e Mon Sep 17 00:00:00 2001 +From 23f3b2c20f91f5129f8facb7ec906030a6a633e8 Mon Sep 17 00:00:00 2001 From: Aikar Date: Tue, 19 Dec 2017 22:57:26 -0500 Subject: [PATCH] ExperienceOrbMergeEvent @@ -8,10 +8,10 @@ Plugins can cancel this if they want to ensure experience orbs do not lose impor metadata such as spawn reason, or conditionally move data from source to target. diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -index dbda8b35..f9b0f39f 100644 +index ce44dc4292..f059e502e4 100644 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -@@ -552,7 +552,7 @@ public class CraftEventFactory { +@@ -559,7 +559,7 @@ public class CraftEventFactory { if (e instanceof EntityExperienceOrb) { EntityExperienceOrb loopItem = (EntityExperienceOrb) e; // Paper start @@ -21,5 +21,5 @@ index dbda8b35..f9b0f39f 100644 if ((int) newTotal < 0) continue; // Overflow if (maxValue > 0 && newTotal > (long)maxValue) { -- -2.25.1.windows.1 +2.26.2 diff --git a/Spigot-Server-Patches/0188-Ability-to-apply-mending-to-XP-API.patch b/Spigot-Server-Patches/0188-Ability-to-apply-mending-to-XP-API.patch index 9bebf98fed..6e61d33793 100644 --- a/Spigot-Server-Patches/0188-Ability-to-apply-mending-to-XP-API.patch +++ b/Spigot-Server-Patches/0188-Ability-to-apply-mending-to-XP-API.patch @@ -1,4 +1,4 @@ -From 5cfbc50e91161d98eebeef3974b5e40dfd7a4920 Mon Sep 17 00:00:00 2001 +From c0a4e23a6235828968979537e42e4e4ad87533a5 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 @@ -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/net/minecraft/server/EnchantmentManager.java b/src/main/java/net/minecraft/server/EnchantmentManager.java -index 1822178e..d96c03a1 100644 +index 1822178e8d..d96c03a1a1 100644 --- a/src/main/java/net/minecraft/server/EnchantmentManager.java +++ b/src/main/java/net/minecraft/server/EnchantmentManager.java @@ -246,6 +246,11 @@ public class EnchantmentManager { @@ -26,7 +26,7 @@ index 1822178e..d96c03a1 100644 public static Entry b(Enchantment enchantment, EntityLiving entityliving) { Map map = enchantment.a(entityliving); diff --git a/src/main/java/net/minecraft/server/EntityExperienceOrb.java b/src/main/java/net/minecraft/server/EntityExperienceOrb.java -index b3edb69a..87c6b77c 100644 +index b3edb69a96..87c6b77ce3 100644 --- a/src/main/java/net/minecraft/server/EntityExperienceOrb.java +++ b/src/main/java/net/minecraft/server/EntityExperienceOrb.java @@ -254,10 +254,12 @@ public class EntityExperienceOrb extends Entity { @@ -43,7 +43,7 @@ index b3edb69a..87c6b77c 100644 return i * 2; } diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index 129aefd5..6d46fa23 100644 +index b999821bbe..4375eb0139 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -1018,8 +1018,37 @@ public class CraftPlayer extends CraftHumanEntity implements Player { @@ -86,5 +86,5 @@ index 129aefd5..6d46fa23 100644 } -- -2.25.1.windows.1 +2.26.2 diff --git a/Spigot-Server-Patches/0189-Make-max-squid-spawn-height-configurable.patch b/Spigot-Server-Patches/0189-Make-max-squid-spawn-height-configurable.patch index 5010a35dc4..0d2b68fac1 100644 --- a/Spigot-Server-Patches/0189-Make-max-squid-spawn-height-configurable.patch +++ b/Spigot-Server-Patches/0189-Make-max-squid-spawn-height-configurable.patch @@ -1,4 +1,4 @@ -From d72d7c2745dafb5a961d0f6ae0d3c5f8e974a669 Mon Sep 17 00:00:00 2001 +From 53f25b8ab63b06d8c703ac7317d619c73f12a162 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 @@ -7,7 +7,7 @@ I don't know why upstream made only the minimum height configurable but whatever diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index d2582d98..92e68915 100644 +index d2582d981f..92e6891502 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java @@ -346,4 +346,9 @@ public class PaperWorldConfig { @@ -21,7 +21,7 @@ index d2582d98..92e68915 100644 + } } diff --git a/src/main/java/net/minecraft/server/EntitySquid.java b/src/main/java/net/minecraft/server/EntitySquid.java -index 8c4f3b2c..1c1ff206 100644 +index 8c4f3b2c2e..1c1ff2069d 100644 --- a/src/main/java/net/minecraft/server/EntitySquid.java +++ b/src/main/java/net/minecraft/server/EntitySquid.java @@ -171,7 +171,8 @@ public class EntitySquid extends EntityWaterAnimal { @@ -35,5 +35,5 @@ index 8c4f3b2c..1c1ff206 100644 public void a(float f, float f1, float f2) { -- -2.25.1.windows.1 +2.26.2 diff --git a/Spigot-Server-Patches/0190-PreCreatureSpawnEvent.patch b/Spigot-Server-Patches/0190-PreCreatureSpawnEvent.patch index 49fd4652ce..3dbf6d1002 100644 --- a/Spigot-Server-Patches/0190-PreCreatureSpawnEvent.patch +++ b/Spigot-Server-Patches/0190-PreCreatureSpawnEvent.patch @@ -1,4 +1,4 @@ -From d82b5b0a49ae6f72dd7d3889eca92c0869e8150e Mon Sep 17 00:00:00 2001 +From a8b0861ae0590786277259cda44596ddb3112d6a 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 c38295a0..43c491f7 100644 +index c38295a09d..43c491f71b 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 c38295a0..43c491f7 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 02157d05..224443e0 100644 +index 02157d051f..224443e03c 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 02157d05..224443e0 100644 Entity entity = entitytypes.a((World) worldserver); -- -2.25.1.windows.1 +2.26.2 diff --git a/Spigot-Server-Patches/0191-PlayerNaturallySpawnCreaturesEvent.patch b/Spigot-Server-Patches/0191-PlayerNaturallySpawnCreaturesEvent.patch index c276b64535..1415af27c4 100644 --- a/Spigot-Server-Patches/0191-PlayerNaturallySpawnCreaturesEvent.patch +++ b/Spigot-Server-Patches/0191-PlayerNaturallySpawnCreaturesEvent.patch @@ -1,4 +1,4 @@ -From cf9f9bf7ba786e33a1fa989f3c82325ca24a4ec3 Mon Sep 17 00:00:00 2001 +From 7c4c7ea9a0240c869dbae6cc55f56a13cfd58cf9 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sun, 14 Jan 2018 17:36:02 -0500 Subject: [PATCH] PlayerNaturallySpawnCreaturesEvent @@ -9,7 +9,7 @@ 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/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java -index 3d4d0d57c5..1d5245ab5b 100644 +index fa4ad0b6dc..8c6550433c 100644 --- a/src/main/java/net/minecraft/server/ChunkProviderServer.java +++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java @@ -589,6 +589,15 @@ public class ChunkProviderServer extends IChunkProvider { @@ -29,7 +29,7 @@ index 3d4d0d57c5..1d5245ab5b 100644 Optional optional = ((Either) playerchunk.b().getNow(PlayerChunk.UNLOADED_CHUNK)).left(); diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java -index 95e09e3519..d8721ab2f8 100644 +index bf32997c42..88692d9eae 100644 --- a/src/main/java/net/minecraft/server/EntityPlayer.java +++ b/src/main/java/net/minecraft/server/EntityPlayer.java @@ -1,5 +1,6 @@ @@ -48,7 +48,7 @@ index 95e09e3519..d8721ab2f8 100644 public final com.destroystokyo.paper.util.misc.PooledLinkedHashSets.PooledObjectLinkedOpenHashSet cachedSingleHashSet; // Paper diff --git a/src/main/java/net/minecraft/server/PlayerChunkMap.java b/src/main/java/net/minecraft/server/PlayerChunkMap.java -index 936fc4f6b9..fcf229ad5d 100644 +index a851997e5f..175734b50c 100644 --- a/src/main/java/net/minecraft/server/PlayerChunkMap.java +++ b/src/main/java/net/minecraft/server/PlayerChunkMap.java @@ -881,12 +881,23 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d { @@ -78,5 +78,5 @@ index 936fc4f6b9..fcf229ad5d 100644 } -- -2.25.1 +2.26.2 diff --git a/Spigot-Server-Patches/0192-Add-setPlayerProfile-API-for-Skulls.patch b/Spigot-Server-Patches/0192-Add-setPlayerProfile-API-for-Skulls.patch index abb6661755..501b9fe0a4 100644 --- a/Spigot-Server-Patches/0192-Add-setPlayerProfile-API-for-Skulls.patch +++ b/Spigot-Server-Patches/0192-Add-setPlayerProfile-API-for-Skulls.patch @@ -1,4 +1,4 @@ -From 9f7326144c684306ed2ac5822ef8fa8c82f4d26f Mon Sep 17 00:00:00 2001 +From fdcf9bec7f1ab69d129a5357010ad5e6112e430a 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 @@ -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/craftbukkit/block/CraftSkull.java b/src/main/java/org/bukkit/craftbukkit/block/CraftSkull.java -index a4bc7f97..2dd2f476 100644 +index 2058859838..ecc32c2fb1 100644 --- a/src/main/java/org/bukkit/craftbukkit/block/CraftSkull.java +++ b/src/main/java/org/bukkit/craftbukkit/block/CraftSkull.java @@ -1,5 +1,7 @@ @@ -48,7 +48,7 @@ index a4bc7f97..2dd2f476 100644 public BlockFace getRotation() { BlockData blockData = getBlockData(); diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaSkull.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaSkull.java -index 4fb27cc7..96d62bbf 100644 +index 4fb27cc7ed..96d62bbf88 100644 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaSkull.java +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaSkull.java @@ -3,6 +3,8 @@ package org.bukkit.craftbukkit.inventory; @@ -89,5 +89,5 @@ index 4fb27cc7..96d62bbf 100644 public OfflinePlayer getOwningPlayer() { if (hasOwner()) { -- -2.25.1.windows.1 +2.26.2 diff --git a/Spigot-Server-Patches/0193-Fill-Profile-Property-Events.patch b/Spigot-Server-Patches/0193-Fill-Profile-Property-Events.patch index 7feb281d05..fd96ec33ea 100644 --- a/Spigot-Server-Patches/0193-Fill-Profile-Property-Events.patch +++ b/Spigot-Server-Patches/0193-Fill-Profile-Property-Events.patch @@ -1,4 +1,4 @@ -From 1f4c9a9620489ca343683979c02bc5bdf5e33514 Mon Sep 17 00:00:00 2001 +From 771a14998159dea3bbe640854a95a632ad26ed0e 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 4b2a6742..61cfdf73 100644 +index 4b2a67423f..61cfdf73c8 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 4b2a6742..61cfdf73 100644 @Override -- -2.25.1.windows.1 +2.26.2 diff --git a/Spigot-Server-Patches/0194-PlayerAdvancementCriterionGrantEvent.patch b/Spigot-Server-Patches/0194-PlayerAdvancementCriterionGrantEvent.patch index e469850706..9a18291c26 100644 --- a/Spigot-Server-Patches/0194-PlayerAdvancementCriterionGrantEvent.patch +++ b/Spigot-Server-Patches/0194-PlayerAdvancementCriterionGrantEvent.patch @@ -1,11 +1,11 @@ -From b7076ba2ea9bf32e67b02aa7d808d3726faf9046 Mon Sep 17 00:00:00 2001 +From 3ae3b9fe84480daf3226cbfdc50058aa0702d94a 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 ca661f39..c41e1384 100644 +index ca661f3933..c41e138472 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 ca661f39..c41e1384 100644 this.i.add(advancement); flag = true; -- -2.25.1.windows.1 +2.26.2 diff --git a/Spigot-Server-Patches/0195-Add-ArmorStand-Item-Meta.patch b/Spigot-Server-Patches/0195-Add-ArmorStand-Item-Meta.patch index 8b1d58843c..ab97b571d8 100644 --- a/Spigot-Server-Patches/0195-Add-ArmorStand-Item-Meta.patch +++ b/Spigot-Server-Patches/0195-Add-ArmorStand-Item-Meta.patch @@ -1,4 +1,4 @@ -From b5fdde6eeed609cb641c841f2369c8da3ce8f542 Mon Sep 17 00:00:00 2001 +From 90f35b89805cd64425f999346377fb9fff30a02c 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 f7005228..3723facc 100644 +index f700522840..3723faccac 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 f7005228..3723facc 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 bd9e09f9..0682c6e8 100644 +index 854836b839..15d27001e8 100644 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java @@ -1429,7 +1429,15 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta { @@ -288,7 +288,7 @@ index bd9e09f9..0682c6e8 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 63023396..3a82bede 100644 +index e4305ce522..ba4cc98f1e 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 63023396..3a82bede 100644 return cleanStack; } -- -2.25.1.windows.1 +2.26.2 diff --git a/Spigot-Server-Patches/0196-Extend-Player-Interact-cancellation.patch b/Spigot-Server-Patches/0196-Extend-Player-Interact-cancellation.patch index eef9281290..ddfffc5617 100644 --- a/Spigot-Server-Patches/0196-Extend-Player-Interact-cancellation.patch +++ b/Spigot-Server-Patches/0196-Extend-Player-Interact-cancellation.patch @@ -1,4 +1,4 @@ -From 24136f5fe9c8145e07f6469d31e47687113eb3b7 Mon Sep 17 00:00:00 2001 +From a3220aef5f98a897a43d377b78919be420e82f9a 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 dff3eb11..e2e5c17c 100644 +index dff3eb1188..e2e5c17c24 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 dff3eb11..e2e5c17c 100644 enuminteractionresult = (event.useItemInHand() != Event.Result.ALLOW) ? EnumInteractionResult.SUCCESS : EnumInteractionResult.PASS; } else if (this.gamemode == EnumGamemode.SPECTATOR) { -- -2.25.1.windows.1 +2.26.2 diff --git a/Spigot-Server-Patches/0197-Tameable-getOwnerUniqueId-API.patch b/Spigot-Server-Patches/0197-Tameable-getOwnerUniqueId-API.patch index a2caa1f1b0..b459830ab0 100644 --- a/Spigot-Server-Patches/0197-Tameable-getOwnerUniqueId-API.patch +++ b/Spigot-Server-Patches/0197-Tameable-getOwnerUniqueId-API.patch @@ -1,4 +1,4 @@ -From 34f347266adf2b086b4ab7c2e8572c0818640596 Mon Sep 17 00:00:00 2001 +From 0e9ec3a5ebf224d4bb29ac534caace3fd2d11cd3 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sat, 24 Feb 2018 01:14:55 -0500 Subject: [PATCH] Tameable#getOwnerUniqueId API diff --git a/Spigot-Server-Patches/0198-Toggleable-player-crits-helps-mitigate-hacked-client.patch b/Spigot-Server-Patches/0198-Toggleable-player-crits-helps-mitigate-hacked-client.patch index 8499f6c6d9..dfb10b0a3c 100644 --- a/Spigot-Server-Patches/0198-Toggleable-player-crits-helps-mitigate-hacked-client.patch +++ b/Spigot-Server-Patches/0198-Toggleable-player-crits-helps-mitigate-hacked-client.patch @@ -1,11 +1,11 @@ -From 95800827cdcc7fae8fa36289665c51b72aa4c540 Mon Sep 17 00:00:00 2001 +From 6e714e5e0e8dbb70e6733fa341505859e83d2c58 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 92e68915..77cdbfad 100644 +index 92e6891502..77cdbfadf9 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 92e68915..77cdbfad 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 c86d22e7..3fe13fe4 100644 +index 542f935b4e..55d08d7748 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 c86d22e7..3fe13fe4 100644 if (flag2) { f *= 1.5F; -- -2.25.1.windows.1 +2.26.2 diff --git a/Spigot-Server-Patches/0199-Fix-NPE-when-getting-location-from-InventoryEnderChe.patch b/Spigot-Server-Patches/0199-Fix-NPE-when-getting-location-from-InventoryEnderChe.patch index 67fb0bc347..21526a1ffa 100644 --- a/Spigot-Server-Patches/0199-Fix-NPE-when-getting-location-from-InventoryEnderChe.patch +++ b/Spigot-Server-Patches/0199-Fix-NPE-when-getting-location-from-InventoryEnderChe.patch @@ -1,4 +1,4 @@ -From 2d743a0d990859ae40ffedb1d72a2cc2c9e7f58b Mon Sep 17 00:00:00 2001 +From 94fb8fa4a9dce547b3b8ce2f12651f340515e004 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 5a9ac396..fd31b9a6 100644 +index 5a9ac3960d..fd31b9a6dc 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 5a9ac396..fd31b9a6 100644 } -- -2.25.1.windows.1 +2.26.2 diff --git a/Spigot-Server-Patches/0200-Prevent-Frosted-Ice-from-loading-holding-chunks.patch b/Spigot-Server-Patches/0200-Prevent-Frosted-Ice-from-loading-holding-chunks.patch index 8344d202b9..7df807cf27 100644 --- a/Spigot-Server-Patches/0200-Prevent-Frosted-Ice-from-loading-holding-chunks.patch +++ b/Spigot-Server-Patches/0200-Prevent-Frosted-Ice-from-loading-holding-chunks.patch @@ -1,11 +1,11 @@ -From 5aeca8ddfade5486b63bfe4ada70a48864218d47 Mon Sep 17 00:00:00 2001 +From a3a2c99fa23304d3bed0411e8c39d5d3c7af9082 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 5e414138..638a0aa5 100644 +index 5e414138e4..638a0aa5ae 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 5e414138..638a0aa5 100644 if (j >= i) { boolean flag = false; -- -2.25.1.windows.1 +2.26.2 diff --git a/Spigot-Server-Patches/0201-Disable-Explicit-Network-Manager-Flushing.patch b/Spigot-Server-Patches/0201-Disable-Explicit-Network-Manager-Flushing.patch index 609d184ef3..ba8771accd 100644 --- a/Spigot-Server-Patches/0201-Disable-Explicit-Network-Manager-Flushing.patch +++ b/Spigot-Server-Patches/0201-Disable-Explicit-Network-Manager-Flushing.patch @@ -1,4 +1,4 @@ -From 2d02e01cb976c09b298b6191b4fa7b8f6ffbd96d Mon Sep 17 00:00:00 2001 +From b44064204be279bfe95634720108a9342054fade 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 e2d8ed88..08e314af 100644 +index e2d8ed88f0..08e314af7c 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 e2d8ed88..08e314af 100644 if (this.t++ % 20 == 0) { -- -2.25.1.windows.1 +2.26.2 diff --git a/Spigot-Server-Patches/0202-Implement-extended-PaperServerListPingEvent.patch b/Spigot-Server-Patches/0202-Implement-extended-PaperServerListPingEvent.patch index 054c4dc03b..bd6fd65660 100644 --- a/Spigot-Server-Patches/0202-Implement-extended-PaperServerListPingEvent.patch +++ b/Spigot-Server-Patches/0202-Implement-extended-PaperServerListPingEvent.patch @@ -1,4 +1,4 @@ -From 769b835f34f38d93a90bc879831d7ab7e9a40109 Mon Sep 17 00:00:00 2001 +From 4eeb502b0f4a874db6cf181131cf3032b0de1be8 Mon Sep 17 00:00:00 2001 From: Minecrell Date: Wed, 11 Oct 2017 15:56:26 +0200 Subject: [PATCH] Implement extended PaperServerListPingEvent diff --git a/Spigot-Server-Patches/0203-Improved-Async-Task-Scheduler.patch b/Spigot-Server-Patches/0203-Improved-Async-Task-Scheduler.patch index 704f556c2f..8a80c7dba1 100644 --- a/Spigot-Server-Patches/0203-Improved-Async-Task-Scheduler.patch +++ b/Spigot-Server-Patches/0203-Improved-Async-Task-Scheduler.patch @@ -1,4 +1,4 @@ -From 9b37c9fbd0cf1c9ef80400eae55378c25800e4b8 Mon Sep 17 00:00:00 2001 +From 596a4006a951ec62758c12c151ef6e7d973f6178 Mon Sep 17 00:00:00 2001 From: Aikar Date: Fri, 16 Mar 2018 22:59:43 -0400 Subject: [PATCH] Improved Async Task Scheduler diff --git a/Spigot-Server-Patches/0204-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch b/Spigot-Server-Patches/0204-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch index 5a58f9cf07..9cd6f32b9c 100644 --- a/Spigot-Server-Patches/0204-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch +++ b/Spigot-Server-Patches/0204-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch @@ -1,4 +1,4 @@ -From bc462ac9f523431a5b85df4829112a7a80f5bdfa Mon Sep 17 00:00:00 2001 +From e1a03b98e088cc5aa1affbeae61f0cb470b6abfa 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 1fb609dc..1b43f921 100644 +index 1fb609dcfc..1b43f92164 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 1fb609dc..1b43f921 100644 if (PlayerPreLoginEvent.getHandlerList().getRegisteredListeners().length != 0) { final PlayerPreLoginEvent event = new PlayerPreLoginEvent(playerName, address, uniqueId); -- -2.25.1.windows.1 +2.26.2 diff --git a/Spigot-Server-Patches/0205-Player.setPlayerProfile-API.patch b/Spigot-Server-Patches/0205-Player.setPlayerProfile-API.patch index 079851d266..e7d643975c 100644 --- a/Spigot-Server-Patches/0205-Player.setPlayerProfile-API.patch +++ b/Spigot-Server-Patches/0205-Player.setPlayerProfile-API.patch @@ -1,4 +1,4 @@ -From aea5efe6d3f4aac48a477d0522f1667fb7bffdb7 Mon Sep 17 00:00:00 2001 +From 0087a8e8d4ba94b763f156530fa64f86279db2ea 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 3fe13fe4..60dd8672 100644 +index 55d08d7748..fda1b3d91b 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 3fe13fe4..60dd8672 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 1b43f921..1c4ac7bf 100644 +index 1b43f92164..1c4ac7bf7a 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 { @@ -48,7 +48,7 @@ index 1b43f921..1c4ac7bf 100644 uniqueId = i.getId(); // Paper end diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index 6d46fa23..ef7fff75 100644 +index 4375eb0139..37422a0953 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -1,6 +1,8 @@ @@ -141,5 +141,5 @@ index 6d46fa23..ef7fff75 100644 public void removeDisconnectingPlayer(Player player) { hiddenPlayers.remove(player.getUniqueId()); -- -2.25.1.windows.1 +2.26.2 diff --git a/Spigot-Server-Patches/0206-Fix-Dragon-Server-Crashes.patch b/Spigot-Server-Patches/0206-Fix-Dragon-Server-Crashes.patch index 6c01154e80..6195094d23 100644 --- a/Spigot-Server-Patches/0206-Fix-Dragon-Server-Crashes.patch +++ b/Spigot-Server-Patches/0206-Fix-Dragon-Server-Crashes.patch @@ -1,4 +1,4 @@ -From 88f0ade67220eaabe4886bf7c08328bfbce16f73 Mon Sep 17 00:00:00 2001 +From 3c29ae447afe27fc132a399a56deea55dae6723e 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 c42de977..40a8beff 100644 +index c42de9771e..40a8beff55 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 c42de977..40a8beff 100644 if (d3 < 0.0D) { d3 = d2; -- -2.25.1.windows.1 +2.26.2 diff --git a/Spigot-Server-Patches/0207-getPlayerUniqueId-API.patch b/Spigot-Server-Patches/0207-getPlayerUniqueId-API.patch index add84b1b47..0c6504c7df 100644 --- a/Spigot-Server-Patches/0207-getPlayerUniqueId-API.patch +++ b/Spigot-Server-Patches/0207-getPlayerUniqueId-API.patch @@ -1,4 +1,4 @@ -From f6336af9739de0f97160223724d98efa324f9971 Mon Sep 17 00:00:00 2001 +From 739ab6ab88fc77d4b15e02443ebf63e9db8a6065 Mon Sep 17 00:00:00 2001 From: Aikar Date: Thu, 22 Mar 2018 01:40:24 -0400 Subject: [PATCH] getPlayerUniqueId API diff --git a/Spigot-Server-Patches/0208-Make-player-data-saving-configurable.patch b/Spigot-Server-Patches/0208-Make-player-data-saving-configurable.patch index accd40911e..76135bf45e 100644 --- a/Spigot-Server-Patches/0208-Make-player-data-saving-configurable.patch +++ b/Spigot-Server-Patches/0208-Make-player-data-saving-configurable.patch @@ -1,11 +1,11 @@ -From b13a8729b87f5d82fc1113556483f67ccd77a2e5 Mon Sep 17 00:00:00 2001 +From ce9ff542192c4f968f716955c97589ba82e730b2 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 5884b04f..ba341e01 100644 +index 5884b04f7e..ba341e0174 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 5884b04f..ba341e01 100644 + } } diff --git a/src/main/java/net/minecraft/server/WorldNBTStorage.java b/src/main/java/net/minecraft/server/WorldNBTStorage.java -index a0254d8e..e60e10c5 100644 +index a0254d8e51..e60e10c57d 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 a0254d8e..e60e10c5 100644 NBTTagCompound nbttagcompound = entityhuman.save(new NBTTagCompound()); File file = new File(this.playerDir, entityhuman.getUniqueIDString() + ".dat.tmp"); -- -2.25.1.windows.1 +2.26.2 diff --git a/Spigot-Server-Patches/0209-Make-legacy-ping-handler-more-reliable.patch b/Spigot-Server-Patches/0209-Make-legacy-ping-handler-more-reliable.patch index 9b8788c370..b135a1ca72 100644 --- a/Spigot-Server-Patches/0209-Make-legacy-ping-handler-more-reliable.patch +++ b/Spigot-Server-Patches/0209-Make-legacy-ping-handler-more-reliable.patch @@ -1,4 +1,4 @@ -From 8e18d5f39b428086b19d00e6e8607447737e2691 Mon Sep 17 00:00:00 2001 +From 3fbe82d1fd890f810182fab3cc4322f8ad851cef 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 9ee5a1ff..063efe9b 100644 +index 9ee5a1ff02..063efe9bbe 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 9ee5a1ff..063efe9b 100644 channelhandlercontext.pipeline().firstContext().writeAndFlush(bytebuf).addListener(ChannelFutureListener.CLOSE); } -- -2.25.1.windows.1 +2.26.2 diff --git a/Spigot-Server-Patches/0210-Call-PaperServerListPingEvent-for-legacy-pings.patch b/Spigot-Server-Patches/0210-Call-PaperServerListPingEvent-for-legacy-pings.patch index 77b02ea36a..e6eed6b437 100644 --- a/Spigot-Server-Patches/0210-Call-PaperServerListPingEvent-for-legacy-pings.patch +++ b/Spigot-Server-Patches/0210-Call-PaperServerListPingEvent-for-legacy-pings.patch @@ -1,4 +1,4 @@ -From 69bbccc848de18e55c166461c4a59828a3afedbf Mon Sep 17 00:00:00 2001 +From 6e5caec0925007be9a5febd63c2942e9b0b1a7fb 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 00000000..74c012fd +index 0000000000..74c012fd40 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/network/PaperLegacyStatusClient.java @@ -0,0 +1,73 @@ @@ -84,7 +84,7 @@ index 00000000..74c012fd + +} diff --git a/src/main/java/net/minecraft/server/LegacyPingHandler.java b/src/main/java/net/minecraft/server/LegacyPingHandler.java -index 063efe9b..4a49fe4c 100644 +index 063efe9bbe..4a49fe4cc6 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 063efe9b..4a49fe4c 100644 } -- -2.25.1.windows.1 +2.26.2 diff --git a/Spigot-Server-Patches/0211-Flag-to-disable-the-channel-limit.patch b/Spigot-Server-Patches/0211-Flag-to-disable-the-channel-limit.patch index 191aea2a02..c9124d4a32 100644 --- a/Spigot-Server-Patches/0211-Flag-to-disable-the-channel-limit.patch +++ b/Spigot-Server-Patches/0211-Flag-to-disable-the-channel-limit.patch @@ -1,4 +1,4 @@ -From 1c24e191a7c157c3396da1746f7386ae2db2b4a6 Mon Sep 17 00:00:00 2001 +From 4871eb7ac7266d76d9d00defd9b8ca6041d44e48 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 @@ -9,7 +9,7 @@ e.g. servers which allow and support the usage of mod packs. provide an optional flag to disable this check, at your own risk. diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index ef7fff75..25c80a40 100644 +index 37422a0953..c69b3b33d8 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -138,6 +138,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player { @@ -30,5 +30,5 @@ index ef7fff75..25c80a40 100644 if (channels.add(channel)) { server.getPluginManager().callEvent(new PlayerRegisterChannelEvent(this, channel)); -- -2.25.1.windows.1 +2.26.2 diff --git a/Spigot-Server-Patches/0212-Add-method-to-open-already-placed-sign.patch b/Spigot-Server-Patches/0212-Add-method-to-open-already-placed-sign.patch index 6d8b719e77..7280d92c15 100644 --- a/Spigot-Server-Patches/0212-Add-method-to-open-already-placed-sign.patch +++ b/Spigot-Server-Patches/0212-Add-method-to-open-already-placed-sign.patch @@ -1,4 +1,4 @@ -From ec8f5fbdd3b942165876a395d64324a93e529a35 Mon Sep 17 00:00:00 2001 +From b994c2d99063dcc174045c4c7c3b8d81c4cc44c1 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/Spigot-Server-Patches/0213-Configurable-sprint-interruption-on-attack.patch b/Spigot-Server-Patches/0213-Configurable-sprint-interruption-on-attack.patch index 759b4196f3..b588b19f86 100644 --- a/Spigot-Server-Patches/0213-Configurable-sprint-interruption-on-attack.patch +++ b/Spigot-Server-Patches/0213-Configurable-sprint-interruption-on-attack.patch @@ -1,4 +1,4 @@ -From d40911b9c0e73b919d14cec9820b93cafae6fdb3 Mon Sep 17 00:00:00 2001 +From bfbbb11eb7a27c639aa50ef824d72a174286e407 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 @@ -6,7 +6,7 @@ Subject: [PATCH] Configurable sprint interruption on attack If the sprint interruption is disabled players continue sprinting when they attack entities. diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index 77cdbfad..171c8e30 100644 +index 77cdbfadf9..171c8e3031 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java @@ -356,4 +356,9 @@ public class PaperWorldConfig { @@ -20,7 +20,7 @@ index 77cdbfad..171c8e30 100644 + } } diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java -index 60dd8672..1d3c7ce4 100644 +index fda1b3d91b..14a0e3d41c 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 { @@ -37,5 +37,5 @@ index 60dd8672..1d3c7ce4 100644 if (flag3) { -- -2.25.1.windows.1 +2.26.2 diff --git a/Spigot-Server-Patches/0214-Fix-exploit-that-allowed-colored-signs-to-be-created.patch b/Spigot-Server-Patches/0214-Fix-exploit-that-allowed-colored-signs-to-be-created.patch index 03953ddd66..5e92a4ebac 100644 --- a/Spigot-Server-Patches/0214-Fix-exploit-that-allowed-colored-signs-to-be-created.patch +++ b/Spigot-Server-Patches/0214-Fix-exploit-that-allowed-colored-signs-to-be-created.patch @@ -1,11 +1,11 @@ -From 113fb1fd4b2e8d559b02c1c1c077bd79c0df6dda Mon Sep 17 00:00:00 2001 +From b58151d40b18ca1e056d07de1555ad76414ba936 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 64f789d7..4a0a8479 100644 +index 64f789d7c4..4a0a847944 100644 --- a/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java @@ -2502,7 +2502,7 @@ public class PlayerConnection implements PacketListenerPlayIn { @@ -18,5 +18,5 @@ index 64f789d7..4a0a8479 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.25.1.windows.1 +2.26.2 diff --git a/Spigot-Server-Patches/0215-EndermanEscapeEvent.patch b/Spigot-Server-Patches/0215-EndermanEscapeEvent.patch index fcd53a505e..24758630e6 100644 --- a/Spigot-Server-Patches/0215-EndermanEscapeEvent.patch +++ b/Spigot-Server-Patches/0215-EndermanEscapeEvent.patch @@ -1,4 +1,4 @@ -From f007664579914c1639fe7c4e84bd5f9afb03e636 Mon Sep 17 00:00:00 2001 +From 63f51a54c6865db3e11678f2dd51eda1e4cf9e81 Mon Sep 17 00:00:00 2001 From: Aikar Date: Mon, 30 Apr 2018 13:15:55 -0400 Subject: [PATCH] EndermanEscapeEvent @@ -8,7 +8,7 @@ Fires an event anytime an enderman intends to teleport away from the player You may cancel this, enabling ranged attacks to damage the enderman for example. diff --git a/src/main/java/net/minecraft/server/EntityEnderman.java b/src/main/java/net/minecraft/server/EntityEnderman.java -index 538c2169..2893f75b 100644 +index 538c2169cd..2893f75bdf 100644 --- a/src/main/java/net/minecraft/server/EntityEnderman.java +++ b/src/main/java/net/minecraft/server/EntityEnderman.java @@ -2,6 +2,7 @@ package net.minecraft.server; @@ -81,5 +81,5 @@ index 538c2169..2893f75b 100644 } -- -2.25.1.windows.1 +2.26.2 diff --git a/Spigot-Server-Patches/0216-Enderman.teleportRandomly.patch b/Spigot-Server-Patches/0216-Enderman.teleportRandomly.patch index 0da96848b8..31bd530d34 100644 --- a/Spigot-Server-Patches/0216-Enderman.teleportRandomly.patch +++ b/Spigot-Server-Patches/0216-Enderman.teleportRandomly.patch @@ -1,4 +1,4 @@ -From 1ef5f65dfcdae34412cdd21c1c6b563101fc0256 Mon Sep 17 00:00:00 2001 +From 93cf9d1754579d9463ae1ddebaaa7d770e02ff78 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 2893f75b..f279c9b1 100644 +index 2893f75bdf..f279c9b148 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 2893f75b..f279c9b1 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 970efabd..0c5f3593 100644 +index 970efabd37..0c5f359346 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 970efabd..0c5f3593 100644 public MaterialData getCarriedMaterial() { IBlockData blockData = getHandle().getCarried(); -- -2.25.1.windows.1 +2.26.2 diff --git a/Spigot-Server-Patches/0217-Block-Enderpearl-Travel-Exploit.patch b/Spigot-Server-Patches/0217-Block-Enderpearl-Travel-Exploit.patch index 12be427af9..0bd1e0b102 100644 --- a/Spigot-Server-Patches/0217-Block-Enderpearl-Travel-Exploit.patch +++ b/Spigot-Server-Patches/0217-Block-Enderpearl-Travel-Exploit.patch @@ -1,4 +1,4 @@ -From 0a26e05cc7f40eace62585151e07ebdcb2bf9062 Mon Sep 17 00:00:00 2001 +From 44e013f57e81987a5c75f7d197a092fcfc6979bf Mon Sep 17 00:00:00 2001 From: Aikar Date: Mon, 30 Apr 2018 17:15:26 -0400 Subject: [PATCH] Block Enderpearl Travel Exploit @@ -12,7 +12,7 @@ This disables that by not saving the thrower when the chunk is unloaded. This is mainly useful for survival servers that do not allow freeform teleporting. diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index 171c8e30..9c52e31f 100644 +index 171c8e3031..9c52e31f4c 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java @@ -361,4 +361,10 @@ public class PaperWorldConfig { @@ -27,7 +27,7 @@ index 171c8e30..9c52e31f 100644 + } } diff --git a/src/main/java/net/minecraft/server/EntityProjectile.java b/src/main/java/net/minecraft/server/EntityProjectile.java -index 724b78b5..9eed1dce 100644 +index 724b78b5d2..9eed1dce3e 100644 --- a/src/main/java/net/minecraft/server/EntityProjectile.java +++ b/src/main/java/net/minecraft/server/EntityProjectile.java @@ -201,6 +201,7 @@ public abstract class EntityProjectile extends Entity implements IProjectile { @@ -39,5 +39,5 @@ index 724b78b5..9eed1dce 100644 } -- -2.25.1.windows.1 +2.26.2 diff --git a/Spigot-Server-Patches/0218-Expand-World.spawnParticle-API-and-add-Builder.patch b/Spigot-Server-Patches/0218-Expand-World.spawnParticle-API-and-add-Builder.patch index 0732ded99b..4a0f4dcb53 100644 --- a/Spigot-Server-Patches/0218-Expand-World.spawnParticle-API-and-add-Builder.patch +++ b/Spigot-Server-Patches/0218-Expand-World.spawnParticle-API-and-add-Builder.patch @@ -1,4 +1,4 @@ -From 57202c428d5b37af59ddba5124934bd47b788877 Mon Sep 17 00:00:00 2001 +From b01cce47551a1f739f0db7b9b033b19f653bd07e 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 @@ -43,10 +43,10 @@ index eb99f3a967..da391e945c 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 e66c97ba9c..7d73fe4c59 100644 +index 265af7ac7f..d6e101ca9f 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -@@ -2291,11 +2291,17 @@ public class CraftWorld implements World { +@@ -2289,11 +2289,17 @@ public class CraftWorld implements World { @Override public void spawnParticle(Particle particle, double x, double y, double z, int count, double offsetX, double offsetY, double offsetZ, double extra, T data, boolean force) { diff --git a/Spigot-Server-Patches/0219-EndermanAttackPlayerEvent.patch b/Spigot-Server-Patches/0219-EndermanAttackPlayerEvent.patch index 3c0d68c2d9..c8f51bc065 100644 --- a/Spigot-Server-Patches/0219-EndermanAttackPlayerEvent.patch +++ b/Spigot-Server-Patches/0219-EndermanAttackPlayerEvent.patch @@ -1,4 +1,4 @@ -From 22c613e4ff9cfb13730b65ff629044eeeeeee191 Mon Sep 17 00:00:00 2001 +From ffde08dae5e5fe13d0ba9748749ade9bab3a43da 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 f279c9b1..b7c67f0c 100644 +index f279c9b148..b7c67f0cdb 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 f279c9b1..b7c67f0c 100644 if (itemstack.getItem() == Blocks.CARVED_PUMPKIN.getItem()) { -- -2.25.1.windows.1 +2.26.2 diff --git a/Spigot-Server-Patches/0220-WitchConsumePotionEvent.patch b/Spigot-Server-Patches/0220-WitchConsumePotionEvent.patch index f148845b6c..6ec0678a9d 100644 --- a/Spigot-Server-Patches/0220-WitchConsumePotionEvent.patch +++ b/Spigot-Server-Patches/0220-WitchConsumePotionEvent.patch @@ -1,4 +1,4 @@ -From 95921ccb9289471955c3915944fc4ad61c7edd3e Mon Sep 17 00:00:00 2001 +From 2e95466d89c83967f8b92210f8572dcc3478f2ad 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 ddff0b57..aa901117 100644 +index ddff0b5786..aa90111716 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 ddff0b57..aa901117 100644 if (list != null) { Iterator iterator = list.iterator(); -- -2.25.1.windows.1 +2.26.2 diff --git a/Spigot-Server-Patches/0221-WitchThrowPotionEvent.patch b/Spigot-Server-Patches/0221-WitchThrowPotionEvent.patch index 7a855df8f1..46960cc907 100644 --- a/Spigot-Server-Patches/0221-WitchThrowPotionEvent.patch +++ b/Spigot-Server-Patches/0221-WitchThrowPotionEvent.patch @@ -1,4 +1,4 @@ -From 02447e7b90d67cf6ed83c47f88a374ed51962d7c Mon Sep 17 00:00:00 2001 +From 5e7c7363275148ef0f6debe038f75d879ccde147 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 aa901117..1f2759e9 100644 +index aa90111716..1f2759e95e 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 aa901117..1f2759e9 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.25.1.windows.1 +2.26.2 diff --git a/Spigot-Server-Patches/0222-Allow-spawning-Item-entities-with-World.spawnEntity.patch b/Spigot-Server-Patches/0222-Allow-spawning-Item-entities-with-World.spawnEntity.patch index 22018e228e..16872763a6 100644 --- a/Spigot-Server-Patches/0222-Allow-spawning-Item-entities-with-World.spawnEntity.patch +++ b/Spigot-Server-Patches/0222-Allow-spawning-Item-entities-with-World.spawnEntity.patch @@ -1,4 +1,4 @@ -From 25caaaa1941940964265ef43367036d28837e9dc Mon Sep 17 00:00:00 2001 +From 13516011ad9407c5f2e0d409b8e2ba7a103b0861 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,10 +8,10 @@ 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 7d73fe4c59..2575228cb0 100644 +index d6e101ca9f..a427fea9c7 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -@@ -1493,6 +1493,10 @@ public class CraftWorld implements World { +@@ -1491,6 +1491,10 @@ public class CraftWorld implements World { if (Boat.class.isAssignableFrom(clazz)) { entity = new EntityBoat(world, x, y, z); entity.setPositionRotation(x, y, z, yaw, pitch); diff --git a/Spigot-Server-Patches/0223-WitchReadyPotionEvent.patch b/Spigot-Server-Patches/0223-WitchReadyPotionEvent.patch index ec68a19fe0..4dea3818ec 100644 --- a/Spigot-Server-Patches/0223-WitchReadyPotionEvent.patch +++ b/Spigot-Server-Patches/0223-WitchReadyPotionEvent.patch @@ -1,11 +1,11 @@ -From bf579a62bd48c3a09294f85746c499019f28148a Mon Sep 17 00:00:00 2001 +From f08a0c225edc9e8d62a9d7649e97e45c855f9118 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 1f2759e9..be6ecfb0 100644 +index 1f2759e95e..be6ecfb08a 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 1f2759e9..be6ecfb0 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.25.1.windows.1 +2.26.2 diff --git a/Spigot-Server-Patches/0224-ItemStack-getMaxItemUseDuration.patch b/Spigot-Server-Patches/0224-ItemStack-getMaxItemUseDuration.patch index b94be720c6..90dbd2ab3d 100644 --- a/Spigot-Server-Patches/0224-ItemStack-getMaxItemUseDuration.patch +++ b/Spigot-Server-Patches/0224-ItemStack-getMaxItemUseDuration.patch @@ -1,4 +1,4 @@ -From 778cd81b84f24e5bb53148de377c49b0323d43bb Mon Sep 17 00:00:00 2001 +From e29404b4426b7fb849d91fd1f6c23d29eaddc250 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 854cffe6..641a52b9 100644 +index 854cffe6c9..641a52b968 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 854cffe6..641a52b9 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 3dd912ab..a41be8fd 100644 +index 3dd912abe3..a41be8fdae 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 3dd912ab..a41be8fd 100644 public void addUnsafeEnchantment(Enchantment ench, int level) { Validate.notNull(ench, "Cannot add null enchantment"); -- -2.25.1.windows.1 +2.26.2 diff --git a/Spigot-Server-Patches/0225-Implement-EntityTeleportEndGatewayEvent.patch b/Spigot-Server-Patches/0225-Implement-EntityTeleportEndGatewayEvent.patch index fdbe9d32de..e1c881942e 100644 --- a/Spigot-Server-Patches/0225-Implement-EntityTeleportEndGatewayEvent.patch +++ b/Spigot-Server-Patches/0225-Implement-EntityTeleportEndGatewayEvent.patch @@ -1,11 +1,11 @@ -From 7e35cbea7e3b41972883ce15c399b679edc82787 Mon Sep 17 00:00:00 2001 +From b1413cdf91fe66723d2337daea75a80f42de66ce 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 78fba793..c71f7600 100644 +index 78fba79378..c71f76004e 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 78fba793..c71f7600 100644 this.h(); -- -2.25.1.windows.1 +2.26.2 diff --git a/Spigot-Server-Patches/0226-Unset-Ignited-flag-on-cancel-of-Explosion-Event.patch b/Spigot-Server-Patches/0226-Unset-Ignited-flag-on-cancel-of-Explosion-Event.patch index 998447539d..71ab1a1302 100644 --- a/Spigot-Server-Patches/0226-Unset-Ignited-flag-on-cancel-of-Explosion-Event.patch +++ b/Spigot-Server-Patches/0226-Unset-Ignited-flag-on-cancel-of-Explosion-Event.patch @@ -1,4 +1,4 @@ -From 6905451b147c37757bf3d12e01a00d1a8ae06873 Mon Sep 17 00:00:00 2001 +From 54b303dbb3e7f227a7e1a948dea852f989e050be 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 374cf28f..b8953007 100644 +index 374cf28fb4..b895300797 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 374cf28f..b8953007 100644 // CraftBukkit end } -- -2.25.1.windows.1 +2.26.2 diff --git a/Spigot-Server-Patches/0227-Fix-CraftEntity-hashCode.patch b/Spigot-Server-Patches/0227-Fix-CraftEntity-hashCode.patch index 316afca08b..218a8d0264 100644 --- a/Spigot-Server-Patches/0227-Fix-CraftEntity-hashCode.patch +++ b/Spigot-Server-Patches/0227-Fix-CraftEntity-hashCode.patch @@ -1,4 +1,4 @@ -From c4a96158ae10aab5885690d509723ea7a8d9f6ca Mon Sep 17 00:00:00 2001 +From c7c400bcfbdc1b12f6cf44a9cd6d2128b970ea2e Mon Sep 17 00:00:00 2001 From: Aikar Date: Sun, 10 Jun 2018 20:20:15 -0400 Subject: [PATCH] Fix CraftEntity hashCode diff --git a/Spigot-Server-Patches/0228-Configurable-Alternative-LootPool-Luck-Formula.patch b/Spigot-Server-Patches/0228-Configurable-Alternative-LootPool-Luck-Formula.patch index 54e5fa49b6..b78809c175 100644 --- a/Spigot-Server-Patches/0228-Configurable-Alternative-LootPool-Luck-Formula.patch +++ b/Spigot-Server-Patches/0228-Configurable-Alternative-LootPool-Luck-Formula.patch @@ -1,4 +1,4 @@ -From f4a2d9b520ac493ec58e8720a51f1c293528a2bf Mon Sep 17 00:00:00 2001 +From 2635ab2ca3377bff8d9600f95ce3cb9fdae8714f 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 ba341e01..26ab855d 100644 +index ba341e0174..26ab855dcf 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 ba341e01..26ab855d 100644 + } } diff --git a/src/main/java/net/minecraft/server/LootSelectorEntry.java b/src/main/java/net/minecraft/server/LootSelectorEntry.java -index 3ed6a1e7..03398ce8 100644 +index 3ed6a1e785..03398ce8fd 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 3ed6a1e7..03398ce8 100644 + // Paper end } -- -2.25.1.windows.1 +2.26.2 diff --git a/Spigot-Server-Patches/0229-Print-Error-details-when-failing-to-save-player-data.patch b/Spigot-Server-Patches/0229-Print-Error-details-when-failing-to-save-player-data.patch index da024b55b6..b5cd985b9b 100644 --- a/Spigot-Server-Patches/0229-Print-Error-details-when-failing-to-save-player-data.patch +++ b/Spigot-Server-Patches/0229-Print-Error-details-when-failing-to-save-player-data.patch @@ -1,11 +1,11 @@ -From fd4864fdd1508bd2a1bfa8545a90f61a84808e35 Mon Sep 17 00:00:00 2001 +From 1d9085dbdb123a9eddb5bbe1df611dcccf0622ef 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 e60e10c5..350ac42d 100644 +index e60e10c57d..350ac42d6b 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 e60e10c5..350ac42d 100644 } -- -2.25.1.windows.1 +2.26.2 diff --git a/Spigot-Server-Patches/0230-Make-shield-blocking-delay-configurable.patch b/Spigot-Server-Patches/0230-Make-shield-blocking-delay-configurable.patch index 73604cbf9f..9400fe3bbd 100644 --- a/Spigot-Server-Patches/0230-Make-shield-blocking-delay-configurable.patch +++ b/Spigot-Server-Patches/0230-Make-shield-blocking-delay-configurable.patch @@ -1,4 +1,4 @@ -From ea41074f6be3789dca60ece6d8ee7fea44837926 Mon Sep 17 00:00:00 2001 +From 9e40f0f5c7588278bfdfd08d3af646ba9176b617 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 diff --git a/Spigot-Server-Patches/0231-EntityShootBowEvent-consumeArrow-and-getArrowItem-AP.patch b/Spigot-Server-Patches/0231-EntityShootBowEvent-consumeArrow-and-getArrowItem-AP.patch index 14191496d8..c61c2dd563 100644 --- a/Spigot-Server-Patches/0231-EntityShootBowEvent-consumeArrow-and-getArrowItem-AP.patch +++ b/Spigot-Server-Patches/0231-EntityShootBowEvent-consumeArrow-and-getArrowItem-AP.patch @@ -1,4 +1,4 @@ -From f041c322f256f1ceb9551f3992040fddcb69e947 Mon Sep 17 00:00:00 2001 +From 0d943f6d85d2f09f921bdb733ab8838f41b0472b 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 fb9656af..3c95c042 100644 +index fb9656afde..3c95c0428b 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 fb9656af..3c95c042 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 83aa70c2..26899916 100644 +index 83aa70c295..26899916d3 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 { @@ -59,7 +59,7 @@ index 83aa70c2..26899916 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 7be41c86..60a47bcc 100644 +index 7be41c8698..60a47bccca 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 { @@ -72,10 +72,10 @@ index 7be41c86..60a47bcc 100644 event.getProjectile().remove(); return; diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -index f9b0f39f..caf27743 100644 +index f059e502e4..7593159fd6 100644 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -@@ -51,6 +51,7 @@ import net.minecraft.server.GeneratorAccess; +@@ -52,6 +52,7 @@ import net.minecraft.server.GeneratorAccess; import net.minecraft.server.IBlockData; import net.minecraft.server.IChatBaseComponent; import net.minecraft.server.IInventory; @@ -83,7 +83,7 @@ index f9b0f39f..caf27743 100644 import net.minecraft.server.ItemActionContext; import net.minecraft.server.ItemStack; import net.minecraft.server.Items; -@@ -470,16 +471,16 @@ public class CraftEventFactory { +@@ -477,16 +478,16 @@ public class CraftEventFactory { /** * EntityShootBowEvent */ @@ -104,5 +104,5 @@ index f9b0f39f..caf27743 100644 return event; -- -2.25.1.windows.1 +2.26.2 diff --git a/Spigot-Server-Patches/0232-PlayerReadyArrowEvent.patch b/Spigot-Server-Patches/0232-PlayerReadyArrowEvent.patch index aef9a45381..c14766d305 100644 --- a/Spigot-Server-Patches/0232-PlayerReadyArrowEvent.patch +++ b/Spigot-Server-Patches/0232-PlayerReadyArrowEvent.patch @@ -1,4 +1,4 @@ -From 5e5fba553935417846f5c14a73a55775f26122d3 Mon Sep 17 00:00:00 2001 +From 29e918f7337fc371af5b3d953eb016d2be8698c6 Mon Sep 17 00:00:00 2001 From: Aikar Date: Mon, 18 Jun 2018 01:12:53 -0400 Subject: [PATCH] PlayerReadyArrowEvent @@ -7,7 +7,7 @@ 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 1d3c7ce4..4721c288 100644 +index 14a0e3d41c..6e9dd4d371 100644 --- a/src/main/java/net/minecraft/server/EntityHuman.java +++ b/src/main/java/net/minecraft/server/EntityHuman.java @@ -2157,6 +2157,17 @@ public abstract class EntityHuman extends EntityLiving { @@ -38,5 +38,5 @@ index 1d3c7ce4..4721c288 100644 } } -- -2.25.1.windows.1 +2.26.2 diff --git a/Spigot-Server-Patches/0233-Fire-EntityShootBowEvent-for-Illusioner.patch b/Spigot-Server-Patches/0233-Fire-EntityShootBowEvent-for-Illusioner.patch index ea934c3648..b0315e03c5 100644 --- a/Spigot-Server-Patches/0233-Fire-EntityShootBowEvent-for-Illusioner.patch +++ b/Spigot-Server-Patches/0233-Fire-EntityShootBowEvent-for-Illusioner.patch @@ -1,11 +1,11 @@ -From 06950c4b0d9026a642a8ad57724eb824138a49ca Mon Sep 17 00:00:00 2001 +From c817d5dd05290031ab58f2f5b58842d768a122a3 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 2ea0583a..81b7cd06 100644 +index 2ea0583a3e..81b7cd06f2 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 2ea0583a..81b7cd06 100644 class a extends EntityIllagerWizard.c { -- -2.25.1.windows.1 +2.26.2 diff --git a/Spigot-Server-Patches/0234-Implement-EntityKnockbackByEntityEvent.patch b/Spigot-Server-Patches/0234-Implement-EntityKnockbackByEntityEvent.patch index efa97653a5..34fc345906 100644 --- a/Spigot-Server-Patches/0234-Implement-EntityKnockbackByEntityEvent.patch +++ b/Spigot-Server-Patches/0234-Implement-EntityKnockbackByEntityEvent.patch @@ -1,4 +1,4 @@ -From cee6a7dc371776dd785b76fb2dc1e3943fa17b34 Mon Sep 17 00:00:00 2001 +From e83d7d76ebe70cb82ddfed39dc6ef15ad12efb49 Mon Sep 17 00:00:00 2001 From: Brokkonaut Date: Mon, 18 Jun 2018 15:46:23 +0200 Subject: [PATCH] Implement EntityKnockbackByEntityEvent @@ -6,7 +6,7 @@ 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 a738848e..2196dbfc 100644 +index 8f6fe004a4..c1e6792e0d 100644 --- a/src/main/java/net/minecraft/server/EntityLiving.java +++ b/src/main/java/net/minecraft/server/EntityLiving.java @@ -1421,6 +1421,16 @@ public abstract class EntityLiving extends Entity { @@ -27,5 +27,5 @@ index a738848e..2196dbfc 100644 } -- -2.25.1.windows.1 +2.26.2 diff --git a/Spigot-Server-Patches/0235-Expand-Explosions-API.patch b/Spigot-Server-Patches/0235-Expand-Explosions-API.patch index 24558be361..70db8e1165 100644 --- a/Spigot-Server-Patches/0235-Expand-Explosions-API.patch +++ b/Spigot-Server-Patches/0235-Expand-Explosions-API.patch @@ -1,4 +1,4 @@ -From d65fca0c9a9c73059bc922d517c41ade7153d55e Mon Sep 17 00:00:00 2001 +From 9cad60989c501f51ac311e309dca5e78c8ef369d Mon Sep 17 00:00:00 2001 From: Aikar Date: Wed, 20 Jun 2018 23:17:24 -0400 Subject: [PATCH] Expand Explosions API @@ -6,10 +6,10 @@ 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 2575228cb0..4ad82354c4 100644 +index a427fea9c7..a16ab1f845 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 { +@@ -879,6 +879,11 @@ public class CraftWorld implements World { public boolean createExplosion(double x, double y, double z, float power, boolean setFire, boolean breakBlocks, Entity source) { return !world.createExplosion(source == null ? null : ((CraftEntity) source).getHandle(), x, y, z, power, setFire, breakBlocks ? Explosion.Effect.BREAK : Explosion.Effect.NONE).wasCanceled; } diff --git a/Spigot-Server-Patches/0236-LivingEntity-Hand-Raised-Item-Use-API.patch b/Spigot-Server-Patches/0236-LivingEntity-Hand-Raised-Item-Use-API.patch index 83af7a55bc..d6e8275ad8 100644 --- a/Spigot-Server-Patches/0236-LivingEntity-Hand-Raised-Item-Use-API.patch +++ b/Spigot-Server-Patches/0236-LivingEntity-Hand-Raised-Item-Use-API.patch @@ -1,4 +1,4 @@ -From 270b76eb955fa2552a266020ad1df7a66c0fba6e Mon Sep 17 00:00:00 2001 +From 60534734f1dd4b0212c3d4a37511d5b5e493e709 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 diff --git a/Spigot-Server-Patches/0237-RangedEntity-API.patch b/Spigot-Server-Patches/0237-RangedEntity-API.patch index 919da64a8f..402f68762f 100644 --- a/Spigot-Server-Patches/0237-RangedEntity-API.patch +++ b/Spigot-Server-Patches/0237-RangedEntity-API.patch @@ -1,4 +1,4 @@ -From 3a4a542ee1d8cb96f99529d0ba80f07c9741dadd Mon Sep 17 00:00:00 2001 +From 4a56a64f6781fdec16212f121ac2d48f9a3d7008 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 00000000..696660b0 +index 0000000000..696660b089 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/entity/CraftRangedEntity.java @@ -0,0 +1,19 @@ @@ -32,7 +32,7 @@ index 00000000..696660b0 + } +} diff --git a/src/main/java/net/minecraft/server/IRangedEntity.java b/src/main/java/net/minecraft/server/IRangedEntity.java -index b4178ce1..9b79ac77 100644 +index b4178ce1e8..9b79ac77db 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 b4178ce1..9b79ac77 100644 + void q(boolean flag); default void setChargingAttack(boolean charging) { q(charging); }; // Paper } diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftDrowned.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftDrowned.java -index 6e41dfd9..390183ff 100644 +index 6e41dfd923..390183fffd 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftDrowned.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftDrowned.java @@ -1,11 +1,12 @@ @@ -64,7 +64,7 @@ index 6e41dfd9..390183ff 100644 public CraftDrowned(CraftServer server, EntityDrowned entity) { super(server, entity); diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftIllusioner.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftIllusioner.java -index 2ec1af8b..f31d3eed 100644 +index 2ec1af8be4..f31d3eed3a 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 @@ @@ -82,7 +82,7 @@ index 2ec1af8b..f31d3eed 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 23ab78da..3f94c5a9 100644 +index 23ab78da15..3f94c5a920 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 @@ @@ -102,7 +102,7 @@ index 23ab78da..3f94c5a9 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 b4ae8984..02df66ec 100644 +index b4ae898401..02df66ecfe 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 @@ @@ -120,7 +120,7 @@ index b4ae8984..02df66ec 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 27460c59..e482b1c9 100644 +index 27460c59e3..e482b1c9dc 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 @@ @@ -138,7 +138,7 @@ index 27460c59..e482b1c9 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 244e4dc8..bae107e7 100644 +index 244e4dc8ec..bae107e76e 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 @@ @@ -156,7 +156,7 @@ index 244e4dc8..bae107e7 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 38b555cc..03cf6136 100644 +index 38b555cc7e..03cf6136e6 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 @@ @@ -176,5 +176,5 @@ index 38b555cc..03cf6136 100644 private BossBar bossBar; -- -2.25.1.windows.1 +2.26.2 diff --git a/Spigot-Server-Patches/0238-Add-config-to-disable-ender-dragon-legacy-check.patch b/Spigot-Server-Patches/0238-Add-config-to-disable-ender-dragon-legacy-check.patch index 274cef7cec..6a4bd24cd9 100644 --- a/Spigot-Server-Patches/0238-Add-config-to-disable-ender-dragon-legacy-check.patch +++ b/Spigot-Server-Patches/0238-Add-config-to-disable-ender-dragon-legacy-check.patch @@ -1,11 +1,11 @@ -From b46d2f6dc34acc6e533388d1e353827bf192d8d4 Mon Sep 17 00:00:00 2001 +From 2573bbb96c0627d729050ead7d8293dddc6e6cd5 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/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index 33ce9a50..cea15d50 100644 +index 33ce9a5004..cea15d50ed 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java @@ -372,4 +372,9 @@ public class PaperWorldConfig { @@ -19,7 +19,7 @@ index 33ce9a50..cea15d50 100644 + } } diff --git a/src/main/java/net/minecraft/server/EnderDragonBattle.java b/src/main/java/net/minecraft/server/EnderDragonBattle.java -index 06748118..687efa02 100644 +index 0674811849..687efa022d 100644 --- a/src/main/java/net/minecraft/server/EnderDragonBattle.java +++ b/src/main/java/net/minecraft/server/EnderDragonBattle.java @@ -28,10 +28,10 @@ public class EnderDragonBattle { @@ -47,5 +47,5 @@ index 06748118..687efa02 100644 if (nbttagcompound.hasKeyOfType("DragonKilled", 99)) { if (nbttagcompound.b("DragonUUID")) { -- -2.25.1.windows.1 +2.26.2 diff --git a/Spigot-Server-Patches/0239-Implement-World.getEntity-UUID-API.patch b/Spigot-Server-Patches/0239-Implement-World.getEntity-UUID-API.patch index d470342693..ea561657bc 100644 --- a/Spigot-Server-Patches/0239-Implement-World.getEntity-UUID-API.patch +++ b/Spigot-Server-Patches/0239-Implement-World.getEntity-UUID-API.patch @@ -1,14 +1,14 @@ -From 2af5cfdcf69ece67c694519f80a1430638915526 Mon Sep 17 00:00:00 2001 +From ff38c7b228fbe0093392ed067ae2f8612abd2d8f 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 4ad82354c4..e958042208 100644 +index a16ab1f845..cde999c97f 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -@@ -1295,6 +1295,15 @@ public class CraftWorld implements World { +@@ -1293,6 +1293,15 @@ public class CraftWorld implements World { return list; } diff --git a/Spigot-Server-Patches/0240-InventoryCloseEvent-Reason-API.patch b/Spigot-Server-Patches/0240-InventoryCloseEvent-Reason-API.patch index fee75d32f0..a25368f23c 100644 --- a/Spigot-Server-Patches/0240-InventoryCloseEvent-Reason-API.patch +++ b/Spigot-Server-Patches/0240-InventoryCloseEvent-Reason-API.patch @@ -1,4 +1,4 @@ -From 23261131e1357288d6bfa8e3b07425383ce0a68d Mon Sep 17 00:00:00 2001 +From dbee3dc8c2471fbf5ea6d138d1a0b213e9dc6d0c Mon Sep 17 00:00:00 2001 From: Aikar Date: Tue, 3 Jul 2018 21:56:23 -0400 Subject: [PATCH] InventoryCloseEvent Reason API @@ -168,10 +168,10 @@ index c69b3b33d8..ffbf2b983b 100644 // Check if the fromWorld and toWorld are the same. diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -index 1c1341230b..893aaaa1ca 100644 +index 7593159fd6..fc3d9efd84 100644 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -@@ -1293,8 +1293,19 @@ public class CraftEventFactory { +@@ -1300,8 +1300,19 @@ public class CraftEventFactory { return event; } diff --git a/Spigot-Server-Patches/0241-Configurable-Bed-Search-Radius.patch b/Spigot-Server-Patches/0241-Configurable-Bed-Search-Radius.patch index e35f558ffe..1361b86721 100644 --- a/Spigot-Server-Patches/0241-Configurable-Bed-Search-Radius.patch +++ b/Spigot-Server-Patches/0241-Configurable-Bed-Search-Radius.patch @@ -1,4 +1,4 @@ -From 8b2de3bab8c798a3901892aa8f3ea552354a1bd7 Mon Sep 17 00:00:00 2001 +From 8484c9a9399fea29f53b0e0255d6f584cdce5543 Mon Sep 17 00:00:00 2001 From: Aikar Date: Wed, 4 Jul 2018 15:22:06 -0400 Subject: [PATCH] Configurable Bed Search Radius @@ -10,7 +10,7 @@ player at their bed should it of became obstructed. Defaults to vanilla 1. diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index cea15d50..387e0dcb 100644 +index cea15d50ed..387e0dcb9f 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java @@ -377,4 +377,15 @@ public class PaperWorldConfig { @@ -30,7 +30,7 @@ index cea15d50..387e0dcb 100644 + } } diff --git a/src/main/java/net/minecraft/server/BlockBed.java b/src/main/java/net/minecraft/server/BlockBed.java -index 79475634..74e915c2 100644 +index 7947563426..74e915c21e 100644 --- a/src/main/java/net/minecraft/server/BlockBed.java +++ b/src/main/java/net/minecraft/server/BlockBed.java @@ -196,6 +196,10 @@ public class BlockBed extends BlockFacingHorizontal implements ITileEntity { @@ -162,5 +162,5 @@ index 79475634..74e915c2 100644 } -- -2.25.1.windows.1 +2.26.2 diff --git a/Spigot-Server-Patches/0242-Vex-getSummoner-API.patch b/Spigot-Server-Patches/0242-Vex-getSummoner-API.patch index 9790b6d035..7e07bcd806 100644 --- a/Spigot-Server-Patches/0242-Vex-getSummoner-API.patch +++ b/Spigot-Server-Patches/0242-Vex-getSummoner-API.patch @@ -1,4 +1,4 @@ -From 4220c1abb582cb119764ffa12bee6e89fa580b2d Mon Sep 17 00:00:00 2001 +From e76cf77f553d2c2310152768727b162e0a1d25fd 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 cd9fb3aa..a4673046 100644 +index cd9fb3aabf..a46730460e 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 cd9fb3aa..a4673046 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 737a37b6..169c951e 100644 +index 737a37b6fe..169c951ec3 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 737a37b6..169c951e 100644 public String toString() { return "CraftVex"; -- -2.25.1.windows.1 +2.26.2 diff --git a/Spigot-Server-Patches/0243-Refresh-player-inventory-when-cancelling-PlayerInter.patch b/Spigot-Server-Patches/0243-Refresh-player-inventory-when-cancelling-PlayerInter.patch index 836db3eec5..0eef102303 100644 --- a/Spigot-Server-Patches/0243-Refresh-player-inventory-when-cancelling-PlayerInter.patch +++ b/Spigot-Server-Patches/0243-Refresh-player-inventory-when-cancelling-PlayerInter.patch @@ -1,4 +1,4 @@ -From 54643c6b1738a807643df04c1f5bbf8879002a7f Mon Sep 17 00:00:00 2001 +From 142bf8f4d121f29fe51d0a41095bf9da93605960 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 8eb12e89..8648845a 100644 +index 8eb12e89ea..8648845acb 100644 --- a/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java @@ -1950,6 +1950,7 @@ public class PlayerConnection implements PacketListenerPlayIn { @@ -28,5 +28,5 @@ index 8eb12e89..8648845a 100644 } // CraftBukkit end -- -2.25.1.windows.1 +2.26.2 diff --git a/Spigot-Server-Patches/0244-Don-t-change-the-Entity-Random-seed-for-squids.patch b/Spigot-Server-Patches/0244-Don-t-change-the-Entity-Random-seed-for-squids.patch index d9d196e8af..38655a341c 100644 --- a/Spigot-Server-Patches/0244-Don-t-change-the-Entity-Random-seed-for-squids.patch +++ b/Spigot-Server-Patches/0244-Don-t-change-the-Entity-Random-seed-for-squids.patch @@ -1,11 +1,11 @@ -From 55eb86292e527cd8e69cd482c0c434d18b783498 Mon Sep 17 00:00:00 2001 +From 5a5964724638df43100a97619cf5eb8c821f1c11 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 1c1ff206..92efe4e7 100644 +index 1c1ff2069d..92efe4e7f5 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 1c1ff206..92efe4e7 100644 } -- -2.25.1.windows.1 +2.26.2 diff --git a/Spigot-Server-Patches/0245-Re-add-vanilla-entity-warnings-for-duplicates.patch b/Spigot-Server-Patches/0245-Re-add-vanilla-entity-warnings-for-duplicates.patch index f1fecc8073..11bf149f5d 100644 --- a/Spigot-Server-Patches/0245-Re-add-vanilla-entity-warnings-for-duplicates.patch +++ b/Spigot-Server-Patches/0245-Re-add-vanilla-entity-warnings-for-duplicates.patch @@ -1,4 +1,4 @@ -From 955e0d13a2ab0e817fc312a943a8cadb4a01f7ad Mon Sep 17 00:00:00 2001 +From 8c896a05ac40b3c7b64c3f40f28564fca68978c0 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,7 +8,7 @@ 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 c5b4218b..4cbf390c 100644 +index c5b4218b44..4cbf390ce0 100644 --- a/src/main/java/net/minecraft/server/WorldServer.java +++ b/src/main/java/net/minecraft/server/WorldServer.java @@ -1036,7 +1036,8 @@ public class WorldServer extends World { @@ -22,5 +22,5 @@ index c5b4218b..4cbf390c 100644 } } -- -2.25.1.windows.1 +2.26.2 diff --git a/Spigot-Server-Patches/0246-Avoid-item-merge-if-stack-size-above-max-stack-size.patch b/Spigot-Server-Patches/0246-Avoid-item-merge-if-stack-size-above-max-stack-size.patch index b014dc36c7..1ee7b639d8 100644 --- a/Spigot-Server-Patches/0246-Avoid-item-merge-if-stack-size-above-max-stack-size.patch +++ b/Spigot-Server-Patches/0246-Avoid-item-merge-if-stack-size-above-max-stack-size.patch @@ -1,11 +1,11 @@ -From bf5750c5d0eae954924d4554e426ce7c60240c34 Mon Sep 17 00:00:00 2001 +From 0edef40fb8ea590b8a2db365016c780e8554fa68 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 5efcc50a..e5c9bac8 100644 +index 5efcc50ab9..e5c9bac88a 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 5efcc50a..e5c9bac8 100644 double radius = world.spigotConfig.itemMerge; List list = this.world.a(EntityItem.class, this.getBoundingBox().grow(radius, radius, radius), (entityitem) -> { -- -2.25.1.windows.1 +2.26.2 diff --git a/Spigot-Server-Patches/0247-Use-asynchronous-Log4j-2-loggers.patch b/Spigot-Server-Patches/0247-Use-asynchronous-Log4j-2-loggers.patch index 5dc9c4cc90..836ddb93ad 100644 --- a/Spigot-Server-Patches/0247-Use-asynchronous-Log4j-2-loggers.patch +++ b/Spigot-Server-Patches/0247-Use-asynchronous-Log4j-2-loggers.patch @@ -1,4 +1,4 @@ -From 88d409e97c231e0d2feddd4422df304165e39083 Mon Sep 17 00:00:00 2001 +From 4500dcbee72101646991a9c0744df65c3e26be18 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/Spigot-Server-Patches/0248-add-more-information-to-Entity.toString.patch b/Spigot-Server-Patches/0248-add-more-information-to-Entity.toString.patch index e7bd061206..cda00a5ed0 100644 --- a/Spigot-Server-Patches/0248-add-more-information-to-Entity.toString.patch +++ b/Spigot-Server-Patches/0248-add-more-information-to-Entity.toString.patch @@ -1,4 +1,4 @@ -From 924ae2bd1b7c1c84bc630daf49616a534f084338 Mon Sep 17 00:00:00 2001 +From 6954d351ef3b9659e787f29ab39e2f6853239399 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 1de1a10c..dce1e2af 100644 +index 153bfd07fa..2ac396dd17 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java @@ -2503,7 +2503,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke @@ -19,5 +19,5 @@ index 1de1a10c..dce1e2af 100644 public boolean isInvulnerable(DamageSource damagesource) { -- -2.25.1.windows.1 +2.26.2 diff --git a/Spigot-Server-Patches/0249-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch b/Spigot-Server-Patches/0249-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch index 4eaaad36ea..4fd41a165b 100644 --- a/Spigot-Server-Patches/0249-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch +++ b/Spigot-Server-Patches/0249-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch @@ -1,4 +1,4 @@ -From 03c1aad49556e57791d79e54b1cfa6eba6b8c728 Mon Sep 17 00:00:00 2001 +From caee0bbdf5a85c3e27b138db956bd79b9e6cc1ce 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 dce1e2af..d39037a9 100644 +index 2ac396dd17..3043b87cf7 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,7 +19,7 @@ index dce1e2af..d39037a9 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 fcf229ad..f640d2ac 100644 +index 175734b50c..2c7e611663 100644 --- a/src/main/java/net/minecraft/server/PlayerChunkMap.java +++ b/src/main/java/net/minecraft/server/PlayerChunkMap.java @@ -1061,6 +1061,7 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d { @@ -40,7 +40,7 @@ index fcf229ad..f640d2ac 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 2f57c7bc..a1c33c52 100644 +index 2f57c7bc76..a1c33c525c 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -63,6 +63,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable { @@ -52,7 +52,7 @@ index 2f57c7bc..a1c33c52 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 4cbf390c..6ce7f77a 100644 +index 4cbf390ce0..6ce7f77a5e 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 { @@ -122,5 +122,5 @@ index 4cbf390c..6ce7f77a 100644 // CraftBukkit start - SPIGOT-5278 if (entity instanceof EntityDrowned) { -- -2.25.1.windows.1 +2.26.2 diff --git a/Spigot-Server-Patches/0250-EnderDragon-Events.patch b/Spigot-Server-Patches/0250-EnderDragon-Events.patch index 9b0547940b..e942283dc9 100644 --- a/Spigot-Server-Patches/0250-EnderDragon-Events.patch +++ b/Spigot-Server-Patches/0250-EnderDragon-Events.patch @@ -1,11 +1,11 @@ -From c917b7ad01a2ff5e0e4a7886c88f27322829fffa Mon Sep 17 00:00:00 2001 +From 5d513504c9182e66b2a643d08822a2aaa8ff3ddb 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 40a8beff..18fdcd45 100644 +index 40a8beff55..18fdcd453a 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 40a8beff..18fdcd45 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 a2c36548..a9d20ee3 100644 +index a2c36548ca..a9d20ee3bb 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 a2c36548..a9d20ee3 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 bc08b53f..db43ac1c 100644 +index bc08b53fcd..db43ac1cc4 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 bc08b53f..db43ac1c 100644 } -- -2.25.1.windows.1 +2.26.2 diff --git a/Spigot-Server-Patches/0251-PlayerElytraBoostEvent.patch b/Spigot-Server-Patches/0251-PlayerElytraBoostEvent.patch index 90e462f812..c924743d2c 100644 --- a/Spigot-Server-Patches/0251-PlayerElytraBoostEvent.patch +++ b/Spigot-Server-Patches/0251-PlayerElytraBoostEvent.patch @@ -1,11 +1,11 @@ -From b289084fd0f03553bbfaf2ddeb139c0ea95f4d76 Mon Sep 17 00:00:00 2001 +From cdcf8e56e9410a330c4a2d0a3450a4eea7f71914 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 92dac35e..bd524a35 100644 +index 92dac35ec4..bd524a35bb 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 { @@ -30,5 +30,5 @@ index 92dac35e..bd524a35 100644 return InteractionResultWrapper.success(entityhuman.b(enumhand)); -- -2.25.1.windows.1 +2.26.2 diff --git a/Spigot-Server-Patches/0252-Speedup-BlockPos-by-fixing-inlining.patch b/Spigot-Server-Patches/0252-Speedup-BlockPos-by-fixing-inlining.patch index 47203c39be..63aa6d325d 100644 --- a/Spigot-Server-Patches/0252-Speedup-BlockPos-by-fixing-inlining.patch +++ b/Spigot-Server-Patches/0252-Speedup-BlockPos-by-fixing-inlining.patch @@ -1,4 +1,4 @@ -From e9d1ec5e98fae3544674a6c26e75f505c6ba7b4f Mon Sep 17 00:00:00 2001 +From 9efee604d673435c8097e6cf3d4f6df62b2f06b5 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 71089442..c439a8d0 100644 +index 71089442c1..c439a8d019 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 71089442..c439a8d0 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 5dbd3e60..e9ea232a 100644 +index 5dbd3e60fe..e9ea232a78 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 @@ -209,5 +209,5 @@ index 5dbd3e60..e9ea232a 100644 @Override -- -2.25.1.windows.1 +2.26.2 diff --git a/Spigot-Server-Patches/0253-Optimize-RegistryID.c.patch b/Spigot-Server-Patches/0253-Optimize-RegistryID.c.patch index 0ab20a436e..38ea8758b6 100644 --- a/Spigot-Server-Patches/0253-Optimize-RegistryID.c.patch +++ b/Spigot-Server-Patches/0253-Optimize-RegistryID.c.patch @@ -1,4 +1,4 @@ -From b49ffcdd08c8abc5099bbb0811458bda0c5c9aa0 Mon Sep 17 00:00:00 2001 +From ed9bb678e339838a62820f17c03abc50890b47db 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 e15d2867..e8a48b9a 100644 +index e15d286710..e8a48b9a4c 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 e15d2867..e8a48b9a 100644 public int b() { -- -2.25.1.windows.1 +2.26.2 diff --git a/Spigot-Server-Patches/0254-Option-to-prevent-armor-stands-from-doing-entity-loo.patch b/Spigot-Server-Patches/0254-Option-to-prevent-armor-stands-from-doing-entity-loo.patch index dca128d55e..a349379db4 100644 --- a/Spigot-Server-Patches/0254-Option-to-prevent-armor-stands-from-doing-entity-loo.patch +++ b/Spigot-Server-Patches/0254-Option-to-prevent-armor-stands-from-doing-entity-loo.patch @@ -1,11 +1,11 @@ -From 93f5f3cd2b5746c40ce73feeef88bee9c8025583 Mon Sep 17 00:00:00 2001 +From 12b57dbfca613ed14358d59a8e74d8f61816cb5b 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 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index 387e0dcb..eaaa51e4 100644 +index 387e0dcb9f..eaaa51e4bf 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java @@ -388,4 +388,9 @@ public class PaperWorldConfig { @@ -19,7 +19,7 @@ index 387e0dcb..eaaa51e4 100644 + } } diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index a1c33c52..2261c42a 100644 +index a1c33c525c..2261c42ab6 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -781,6 +781,14 @@ public abstract class World implements GeneratorAccess, AutoCloseable { @@ -38,5 +38,5 @@ index a1c33c52..2261c42a 100644 int i = MathHelper.floor(axisalignedbb.minX); int j = MathHelper.f(axisalignedbb.maxX); -- -2.25.1.windows.1 +2.26.2 diff --git a/Spigot-Server-Patches/0255-Vanished-players-don-t-have-rights.patch b/Spigot-Server-Patches/0255-Vanished-players-don-t-have-rights.patch index bd96fcd570..122830acd0 100644 --- a/Spigot-Server-Patches/0255-Vanished-players-don-t-have-rights.patch +++ b/Spigot-Server-Patches/0255-Vanished-players-don-t-have-rights.patch @@ -1,11 +1,11 @@ -From e0cc490d67ef8fa63d54a96e8fa9d631dfd713cb Mon Sep 17 00:00:00 2001 +From 52f3d0180474b714b74a144bf5fa8984f1825cb0 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 d39037a9..7378d531 100644 +index 3043b87cf7..a0379c6a77 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 @@ -18,7 +18,7 @@ index d39037a9..7378d531 100644 protected int j; @Nullable diff --git a/src/main/java/net/minecraft/server/EntityFireworks.java b/src/main/java/net/minecraft/server/EntityFireworks.java -index 278ef79d..5c3731f6 100644 +index 278ef79d89..5c3731f68a 100644 --- a/src/main/java/net/minecraft/server/EntityFireworks.java +++ b/src/main/java/net/minecraft/server/EntityFireworks.java @@ -110,6 +110,16 @@ public class EntityFireworks extends Entity implements IProjectile { @@ -39,7 +39,7 @@ index 278ef79d..5c3731f6 100644 }, RayTrace.BlockCollisionOption.COLLIDER, true); diff --git a/src/main/java/net/minecraft/server/IBlockData.java b/src/main/java/net/minecraft/server/IBlockData.java -index 3a1ad234..9ab57be8 100644 +index 3a1ad2346b..9ab57be850 100644 --- a/src/main/java/net/minecraft/server/IBlockData.java +++ b/src/main/java/net/minecraft/server/IBlockData.java @@ -146,6 +146,7 @@ public class IBlockData extends BlockDataAbstract implements @@ -51,7 +51,7 @@ index 3a1ad234..9ab57be8 100644 return this.getBlock().b(this, iblockaccess, blockposition, voxelshapecollision); } diff --git a/src/main/java/net/minecraft/server/ItemBlock.java b/src/main/java/net/minecraft/server/ItemBlock.java -index ab875a73..aed35336 100644 +index ab875a7365..aed353365b 100644 --- a/src/main/java/net/minecraft/server/ItemBlock.java +++ b/src/main/java/net/minecraft/server/ItemBlock.java @@ -136,7 +136,8 @@ public class ItemBlock extends Item { @@ -65,7 +65,7 @@ index ab875a73..aed35336 100644 BlockCanBuildEvent event = new BlockCanBuildEvent(CraftBlock.at(blockactioncontext.getWorld(), blockactioncontext.getClickPosition()), player, CraftBlockData.fromData(iblockdata), defaultReturn); diff --git a/src/main/java/net/minecraft/server/VoxelShape.java b/src/main/java/net/minecraft/server/VoxelShape.java -index 0f64a3c0..0f95bcbc 100644 +index 0f64a3c056..0f95bcbccb 100644 --- a/src/main/java/net/minecraft/server/VoxelShape.java +++ b/src/main/java/net/minecraft/server/VoxelShape.java @@ -46,6 +46,7 @@ public abstract class VoxelShape { @@ -77,7 +77,7 @@ index 0f64a3c0..0f95bcbc 100644 return (VoxelShape) (this.isEmpty() ? VoxelShapes.a() : new VoxelShapeArray(this.a, new DoubleListOffset(this.a(EnumDirection.EnumAxis.X), d0), new DoubleListOffset(this.a(EnumDirection.EnumAxis.Y), d1), new DoubleListOffset(this.a(EnumDirection.EnumAxis.Z), d2))); } diff --git a/src/main/java/net/minecraft/server/VoxelShapes.java b/src/main/java/net/minecraft/server/VoxelShapes.java -index 143be566..08c83c62 100644 +index 143be566c6..08c83c62df 100644 --- a/src/main/java/net/minecraft/server/VoxelShapes.java +++ b/src/main/java/net/minecraft/server/VoxelShapes.java @@ -33,6 +33,7 @@ public final class VoxelShapes { @@ -97,7 +97,7 @@ index 143be566..08c83c62 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 2261c42a..378ac5ae 100644 +index 2261c42ab6..378ac5ae86 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -152,6 +152,46 @@ public abstract class World implements GeneratorAccess, AutoCloseable { @@ -148,10 +148,10 @@ index 2261c42a..378ac5ae 100644 public boolean p_() { return this.isClientSide; diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -index f931fa48..317a5bf4 100644 +index fc3d9efd84..ee0e371718 100644 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -@@ -1171,6 +1171,14 @@ public class CraftEventFactory { +@@ -1178,6 +1178,14 @@ public class CraftEventFactory { Projectile projectile = (Projectile) entity.getBukkitEntity(); org.bukkit.entity.Entity collided = position.getEntity().getBukkitEntity(); com.destroystokyo.paper.event.entity.ProjectileCollideEvent event = new com.destroystokyo.paper.event.entity.ProjectileCollideEvent(projectile, collided); @@ -167,5 +167,5 @@ index f931fa48..317a5bf4 100644 return event; } -- -2.25.1.windows.1 +2.26.2 diff --git a/Spigot-Server-Patches/0256-Mark-chunk-dirty-anytime-entities-change-to-guarante.patch b/Spigot-Server-Patches/0256-Mark-chunk-dirty-anytime-entities-change-to-guarante.patch index ad83072731..2b243abf23 100644 --- a/Spigot-Server-Patches/0256-Mark-chunk-dirty-anytime-entities-change-to-guarante.patch +++ b/Spigot-Server-Patches/0256-Mark-chunk-dirty-anytime-entities-change-to-guarante.patch @@ -1,4 +1,4 @@ -From 690c2443891b33e7072e3421dc7fd5e234c63cd2 Mon Sep 17 00:00:00 2001 +From 3af39fc278241d8b09966f6443402ebbe999a09c 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 bb58fb79..54d48ef5 100644 +index e66bbb7ee3..803afed60d 100644 --- a/src/main/java/net/minecraft/server/Chunk.java +++ b/src/main/java/net/minecraft/server/Chunk.java @@ -498,6 +498,7 @@ public class Chunk implements IChunkAccess { @@ -26,5 +26,5 @@ index bb58fb79..54d48ef5 100644 this.entities.remove(entity); // Paper } -- -2.25.1.windows.1 +2.26.2 diff --git a/Spigot-Server-Patches/0257-Add-some-Debug-to-Chunk-Entity-slices.patch b/Spigot-Server-Patches/0257-Add-some-Debug-to-Chunk-Entity-slices.patch index 4ee864e870..aaad8f47cd 100644 --- a/Spigot-Server-Patches/0257-Add-some-Debug-to-Chunk-Entity-slices.patch +++ b/Spigot-Server-Patches/0257-Add-some-Debug-to-Chunk-Entity-slices.patch @@ -1,4 +1,4 @@ -From 89795692719d0924f95531a4e2b861c5b03696bc Mon Sep 17 00:00:00 2001 +From f93a941f330b4f7cfeab3b724caf43790160a2b5 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 54d48ef5..8d3c265c 100644 +index 803afed60d..80b5013d95 100644 --- a/src/main/java/net/minecraft/server/Chunk.java +++ b/src/main/java/net/minecraft/server/Chunk.java @@ -489,6 +489,25 @@ public class Chunk implements IChunkAccess { @@ -58,7 +58,7 @@ index 54d48ef5..8d3c265c 100644 return; } diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java -index 7378d531..356de07d 100644 +index a0379c6a77..838aa7da69 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 @@ -70,5 +70,5 @@ index 7378d531..356de07d 100644 public com.destroystokyo.paper.loottable.PaperLootableInventoryData lootableData; // Paper -- -2.25.1.windows.1 +2.26.2 diff --git a/Spigot-Server-Patches/0258-EntityTransformedEvent.patch b/Spigot-Server-Patches/0258-EntityTransformedEvent.patch index d55836317f..f500a4d6c3 100644 --- a/Spigot-Server-Patches/0258-EntityTransformedEvent.patch +++ b/Spigot-Server-Patches/0258-EntityTransformedEvent.patch @@ -1,11 +1,11 @@ -From 3e8e2f0c35df3933f44810dfb16473584f3a4705 Mon Sep 17 00:00:00 2001 +From 78eacf99ffb6511883c1c669530fb41794c7cd66 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 19c12728..3706c31a 100644 +index 19c12728da..3706c31aad 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 19c12728..3706c31a 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 6ca4fa43..6e0020ae 100644 +index 6ca4fa43c4..6e0020ae0b 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 6ca4fa43..6e0020ae 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 0240cef7..31aba6bf 100644 +index 0240cef74a..31aba6bfc3 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 { @@ -49,7 +49,7 @@ index 0240cef7..31aba6bf 100644 this.world.addEntity(entityzombievillager, CreatureSpawnEvent.SpawnReason.INFECTION); // CraftBukkit - add SpawnReason // CraftBukkit end diff --git a/src/main/java/net/minecraft/server/EntityZombieVillager.java b/src/main/java/net/minecraft/server/EntityZombieVillager.java -index 91cac5d5..8082fa61 100644 +index 91cac5d530..8082fa617a 100644 --- a/src/main/java/net/minecraft/server/EntityZombieVillager.java +++ b/src/main/java/net/minecraft/server/EntityZombieVillager.java @@ -197,6 +197,7 @@ public class EntityZombieVillager extends EntityZombie implements VillagerDataHo @@ -61,5 +61,5 @@ index 91cac5d5..8082fa61 100644 worldserver.addEntity(entityvillager, org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason.CURED); // CraftBukkit - add SpawnReason // CraftBukkit end -- -2.25.1.windows.1 +2.26.2 diff --git a/Spigot-Server-Patches/0259-SkeletonHorse-Additions.patch b/Spigot-Server-Patches/0259-SkeletonHorse-Additions.patch index 5ccf8e9d7c..09e0569a60 100644 --- a/Spigot-Server-Patches/0259-SkeletonHorse-Additions.patch +++ b/Spigot-Server-Patches/0259-SkeletonHorse-Additions.patch @@ -1,11 +1,11 @@ -From 2da4f59005ac4219f00f63a985ab3a20efeb2ab0 Mon Sep 17 00:00:00 2001 +From 612535ea01004c39b62d8340215661b87e3e6d5f 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 621f2afe..290cb933 100644 +index 621f2afee5..290cb9337c 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 621f2afe..290cb933 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 dfe5a635..37626f92 100644 +index dfe5a63583..37626f925f 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 dfe5a635..37626f92 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 e822c220..2a7d1d4e 100644 +index e822c2200d..2a7d1d4ec2 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 e822c220..2a7d1d4e 100644 + // Paper end } -- -2.25.1.windows.1 +2.26.2 diff --git a/Spigot-Server-Patches/0260-Prevent-Saving-Bad-entities-to-chunks.patch b/Spigot-Server-Patches/0260-Prevent-Saving-Bad-entities-to-chunks.patch index 89e3a2c402..5c216ba302 100644 --- a/Spigot-Server-Patches/0260-Prevent-Saving-Bad-entities-to-chunks.patch +++ b/Spigot-Server-Patches/0260-Prevent-Saving-Bad-entities-to-chunks.patch @@ -1,4 +1,4 @@ -From 24172598e778ee9027f3183cdde638f350c3697a Mon Sep 17 00:00:00 2001 +From eb17a9e3291d12df5f3a007c85644bcdbdaca564 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 4af5a230..83bcef7e 100644 +index 13d99de2cd..f54572773c 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 { @@ -80,7 +80,7 @@ index 4af5a230..83bcef7e 100644 public static ChunkStatus.Type a(@Nullable NBTTagCompound nbttagcompound) { if (nbttagcompound != null) { diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java -index 6ce7f77a..87762b17 100644 +index 6ce7f77a5e..87762b1725 100644 --- a/src/main/java/net/minecraft/server/WorldServer.java +++ b/src/main/java/net/minecraft/server/WorldServer.java @@ -1085,6 +1085,7 @@ public class WorldServer extends World { @@ -118,5 +118,5 @@ index 6ce7f77a..87762b17 100644 } -- -2.25.1.windows.1 +2.26.2 diff --git a/Spigot-Server-Patches/0261-Don-t-call-getItemMeta-on-hasItemMeta.patch b/Spigot-Server-Patches/0261-Don-t-call-getItemMeta-on-hasItemMeta.patch index 7e98d76ba6..f262931d1d 100644 --- a/Spigot-Server-Patches/0261-Don-t-call-getItemMeta-on-hasItemMeta.patch +++ b/Spigot-Server-Patches/0261-Don-t-call-getItemMeta-on-hasItemMeta.patch @@ -1,4 +1,4 @@ -From 49432a1910abab2fef75e56f423750a578217537 Mon Sep 17 00:00:00 2001 +From 916b1aa792f12be5f67a7b58f8ec26eedfa59a5c 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 a41be8fd..d5e8a7ee 100644 +index a41be8fdae..d5e8a7ee6d 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 a41be8fd..d5e8a7ee 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 3a82bede..d7314183 100644 +index ba4cc98f1e..3504bcac57 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 3a82bede..d7314183 100644 public void testConflictingStoredEnchantment() { EnchantmentStorageMeta itemMeta = (EnchantmentStorageMeta) Bukkit.getItemFactory().getItemMeta(Material.ENCHANTED_BOOK); -- -2.25.1.windows.1 +2.26.2 diff --git a/Spigot-Server-Patches/0262-Ignore-Dead-Entities-in-entityList-iteration.patch b/Spigot-Server-Patches/0262-Ignore-Dead-Entities-in-entityList-iteration.patch index dc4d085e7d..f12105fd36 100644 --- a/Spigot-Server-Patches/0262-Ignore-Dead-Entities-in-entityList-iteration.patch +++ b/Spigot-Server-Patches/0262-Ignore-Dead-Entities-in-entityList-iteration.patch @@ -1,4 +1,4 @@ -From 539a386def75c231538ac674bb0ace5950674099 Mon Sep 17 00:00:00 2001 +From a584b96dd649886f03c6e96b89433c236a277c6e 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 @@ -92,10 +92,10 @@ index 87762b1725..8d292604c3 100644 } diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -index e958042208..7d2d6566b2 100644 +index cde999c97f..960e29cb16 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -@@ -1031,6 +1031,7 @@ public class CraftWorld implements World { +@@ -1029,6 +1029,7 @@ public class CraftWorld implements World { for (Object o : world.entitiesById.values()) { if (o instanceof net.minecraft.server.Entity) { net.minecraft.server.Entity mcEnt = (net.minecraft.server.Entity) o; @@ -103,7 +103,7 @@ index e958042208..7d2d6566b2 100644 Entity bukkitEntity = mcEnt.getBukkitEntity(); // Assuming that bukkitEntity isn't null -@@ -1050,6 +1051,7 @@ public class CraftWorld implements World { +@@ -1048,6 +1049,7 @@ public class CraftWorld implements World { for (Object o : world.entitiesById.values()) { if (o instanceof net.minecraft.server.Entity) { net.minecraft.server.Entity mcEnt = (net.minecraft.server.Entity) o; @@ -111,7 +111,7 @@ index e958042208..7d2d6566b2 100644 Entity bukkitEntity = mcEnt.getBukkitEntity(); // Assuming that bukkitEntity isn't null -@@ -1076,6 +1078,7 @@ public class CraftWorld implements World { +@@ -1074,6 +1076,7 @@ public class CraftWorld implements World { for (Object entity: world.entitiesById.values()) { if (entity instanceof net.minecraft.server.Entity) { @@ -119,7 +119,7 @@ index e958042208..7d2d6566b2 100644 Entity bukkitEntity = ((net.minecraft.server.Entity) entity).getBukkitEntity(); if (bukkitEntity == null) { -@@ -1099,6 +1102,7 @@ public class CraftWorld implements World { +@@ -1097,6 +1100,7 @@ public class CraftWorld implements World { for (Object entity: world.entitiesById.values()) { if (entity instanceof net.minecraft.server.Entity) { diff --git a/Spigot-Server-Patches/0263-Implement-Expanded-ArmorStand-API.patch b/Spigot-Server-Patches/0263-Implement-Expanded-ArmorStand-API.patch index be09c3d62a..c72d2a699b 100644 --- a/Spigot-Server-Patches/0263-Implement-Expanded-ArmorStand-API.patch +++ b/Spigot-Server-Patches/0263-Implement-Expanded-ArmorStand-API.patch @@ -1,4 +1,4 @@ -From ab0e36766506a33e33b15878e29a96554d9869ba Mon Sep 17 00:00:00 2001 +From ffad3e160f4a75b8038d80aab72ffaa3d6a846f5 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 992d7bfb..61d7d507 100644 +index 992d7bfb0f..61d7d507aa 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 { @@ -29,7 +29,7 @@ index 992d7bfb..61d7d507 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 124c3185..d1d689e5 100644 +index 124c3185bc..d1d689e5d7 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 124c3185..d1d689e5 100644 // Paper end } -- -2.25.1.windows.1 +2.26.2 diff --git a/Spigot-Server-Patches/0264-AnvilDamageEvent.patch b/Spigot-Server-Patches/0264-AnvilDamageEvent.patch index e3ab675a84..39cdbb2a14 100644 --- a/Spigot-Server-Patches/0264-AnvilDamageEvent.patch +++ b/Spigot-Server-Patches/0264-AnvilDamageEvent.patch @@ -1,11 +1,11 @@ -From 20363551cb0ae0df34c79ac6adb9094efbbc2408 Mon Sep 17 00:00:00 2001 +From 59feed5624f3bb41341e68e212e3b4b0c244c3de 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 1d9ce5ef..286b930d 100644 +index 1d9ce5ef1c..286b930ddb 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 1d9ce5ef..286b930d 100644 if (iblockdata1 == null) { world.a(blockposition, false); -- -2.25.1.windows.1 +2.26.2 diff --git a/Spigot-Server-Patches/0265-Add-TNTPrimeEvent.patch b/Spigot-Server-Patches/0265-Add-TNTPrimeEvent.patch index 2cb46d1a91..8a27f893e9 100644 --- a/Spigot-Server-Patches/0265-Add-TNTPrimeEvent.patch +++ b/Spigot-Server-Patches/0265-Add-TNTPrimeEvent.patch @@ -1,11 +1,11 @@ -From 4252cf9ec2387ad8e4883277997e9469b0ca983d Mon Sep 17 00:00:00 2001 +From c43e9d808dadbed0c46f9e99d2a14e78e0512483 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 d32857c8..b41de95a 100644 +index d32857c872..b41de95a63 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 d32857c8..b41de95a 100644 } } diff --git a/src/main/java/net/minecraft/server/BlockTNT.java b/src/main/java/net/minecraft/server/BlockTNT.java -index 6cb82420..592fcd53 100644 +index 6cb82420b4..592fcd538a 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 6cb82420..592fcd53 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 138e2ea5..6a4ccaeb 100644 +index 138e2ea56a..6a4ccaeb0f 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 138e2ea5..6a4ccaeb 100644 this.world.a(blockposition, false); -- -2.25.1.windows.1 +2.26.2 diff --git a/Spigot-Server-Patches/0266-Break-up-and-make-tab-spam-limits-configurable.patch b/Spigot-Server-Patches/0266-Break-up-and-make-tab-spam-limits-configurable.patch index 875c017fe8..a56ae8321a 100644 --- a/Spigot-Server-Patches/0266-Break-up-and-make-tab-spam-limits-configurable.patch +++ b/Spigot-Server-Patches/0266-Break-up-and-make-tab-spam-limits-configurable.patch @@ -1,4 +1,4 @@ -From 18d350ed5beaf27fcfa47d3ad10bd135a9e619b9 Mon Sep 17 00:00:00 2001 +From c3e669652ac5495ab913321ca113ae5e4ad23f14 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 26ab855d..adef07d4 100644 +index 26ab855dcf..adef07d4d5 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 26ab855d..adef07d4 100644 + } } diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java -index 8648845a..6627d840 100644 +index 8648845acb..6627d8402f 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 8648845a..6627d840 100644 return; } -- -2.25.1.windows.1 +2.26.2 diff --git a/Spigot-Server-Patches/0267-Add-hand-to-bucket-events.patch b/Spigot-Server-Patches/0267-Add-hand-to-bucket-events.patch index a1aa0dc1aa..3ba5392d3e 100644 --- a/Spigot-Server-Patches/0267-Add-hand-to-bucket-events.patch +++ b/Spigot-Server-Patches/0267-Add-hand-to-bucket-events.patch @@ -1,11 +1,11 @@ -From de528e7073e73c37bcdc85a2969654bae96323aa Mon Sep 17 00:00:00 2001 +From b4eb9592ea5b7c2264df87d56bdac711bd8f618f 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 diff --git a/src/main/java/net/minecraft/server/EntityCow.java b/src/main/java/net/minecraft/server/EntityCow.java -index 6e385b53..2c8bbf20 100644 +index 6e385b5304..2c8bbf20ae 100644 --- a/src/main/java/net/minecraft/server/EntityCow.java +++ b/src/main/java/net/minecraft/server/EntityCow.java @@ -61,7 +61,7 @@ public class EntityCow extends EntityAnimal { @@ -18,7 +18,7 @@ index 6e385b53..2c8bbf20 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 7c5c0498..ffe4b9eb 100644 +index 7c5c049843..ffe4b9eb86 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 { @@ -69,10 +69,10 @@ index 7c5c0498..ffe4b9eb 100644 ((EntityPlayer) entityhuman).playerConnection.sendPacket(new PacketPlayOutBlockChange(world, blockposition)); // SPIGOT-4238: needed when looking through entity ((EntityPlayer) entityhuman).getBukkitEntity().updateInventory(); // SPIGOT-4541 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -index 317a5bf4..f006b441 100644 +index ee0e371718..5088257e11 100644 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -@@ -373,6 +373,20 @@ public class CraftEventFactory { +@@ -380,6 +380,20 @@ public class CraftEventFactory { } private static PlayerEvent getPlayerBucketEvent(boolean isFilling, World world, EntityHuman who, BlockPosition changed, BlockPosition clicked, EnumDirection clickedFace, ItemStack itemstack, net.minecraft.server.Item item) { @@ -93,7 +93,7 @@ index 317a5bf4..f006b441 100644 Player player = (Player) who.getBukkitEntity(); CraftItemStack itemInHand = CraftItemStack.asNewCraftStack(item); Material bucket = CraftMagicNumbers.getMaterial(itemstack.getItem()); -@@ -385,10 +399,10 @@ public class CraftEventFactory { +@@ -392,10 +406,10 @@ public class CraftEventFactory { PlayerEvent event; if (isFilling) { @@ -107,5 +107,5 @@ index 317a5bf4..f006b441 100644 } -- -2.25.1.windows.1 +2.26.2 diff --git a/Spigot-Server-Patches/0268-MC-135506-Experience-should-save-as-Integers.patch b/Spigot-Server-Patches/0268-MC-135506-Experience-should-save-as-Integers.patch index fbaf337b7b..b4b7940cb6 100644 --- a/Spigot-Server-Patches/0268-MC-135506-Experience-should-save-as-Integers.patch +++ b/Spigot-Server-Patches/0268-MC-135506-Experience-should-save-as-Integers.patch @@ -1,11 +1,11 @@ -From 67313c686e96cb3cdfea580101ecb4b4be67b779 Mon Sep 17 00:00:00 2001 +From e2543fa243427b97564ef7ad260dc15c2ed49256 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 87c6b77c..53c6c338 100644 +index 87c6b77ce3..53c6c33892 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 87c6b77c..53c6c338 100644 } -- -2.25.1.windows.1 +2.26.2 diff --git a/Spigot-Server-Patches/0269-Fix-client-rendering-skulls-from-same-user.patch b/Spigot-Server-Patches/0269-Fix-client-rendering-skulls-from-same-user.patch index dcb8b0d8db..a5da06bf5c 100644 --- a/Spigot-Server-Patches/0269-Fix-client-rendering-skulls-from-same-user.patch +++ b/Spigot-Server-Patches/0269-Fix-client-rendering-skulls-from-same-user.patch @@ -1,4 +1,4 @@ -From 2f847b20fdc241809b36afe8d9518f429d1eb984 Mon Sep 17 00:00:00 2001 +From b87bd6b66ca49509e9f4d499fdd93e3bedfb55e0 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 641a52b9..0b0c3c68 100644 +index 641a52b968..0b0c3c681c 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 641a52b9..0b0c3c68 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 d9574a9a..93ae6dcd 100644 +index d9574a9ace..93ae6dcd78 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 d9574a9a..93ae6dcd 100644 } // CraftBukkit end diff --git a/src/main/java/net/minecraft/server/PacketPlayOutMapChunk.java b/src/main/java/net/minecraft/server/PacketPlayOutMapChunk.java -index 3a1d0deb..1fcbbd69 100644 +index 3a1d0deb0d..1fcbbd698a 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 3a1d0deb..1fcbbd69 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 177cceb7..0882d82c 100644 +index 177cceb77f..0882d82cef 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 177cceb7..0882d82c 100644 public NBTTagCompound b() { return this.save(new NBTTagCompound()); -- -2.25.1.windows.1 +2.26.2 diff --git a/Spigot-Server-Patches/0270-Add-Early-Warning-Feature-to-WatchDog.patch b/Spigot-Server-Patches/0270-Add-Early-Warning-Feature-to-WatchDog.patch index b9a1c8a248..dfa7cddb07 100644 --- a/Spigot-Server-Patches/0270-Add-Early-Warning-Feature-to-WatchDog.patch +++ b/Spigot-Server-Patches/0270-Add-Early-Warning-Feature-to-WatchDog.patch @@ -1,4 +1,4 @@ -From 83987cc4ebede2443b77bf33bd74c3dbbfb4a447 Mon Sep 17 00:00:00 2001 +From 3f8ca5b1170c7a6d5a7455520ff3896e283aeb94 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 diff --git a/Spigot-Server-Patches/0271-Make-EnderDragon-implement-Mob.patch b/Spigot-Server-Patches/0271-Make-EnderDragon-implement-Mob.patch index 136e64e031..b0a4e48e71 100644 --- a/Spigot-Server-Patches/0271-Make-EnderDragon-implement-Mob.patch +++ b/Spigot-Server-Patches/0271-Make-EnderDragon-implement-Mob.patch @@ -1,11 +1,11 @@ -From f4473d86276ae564b5228f42a1b4fff5667e4322 Mon Sep 17 00:00:00 2001 +From fad1c82f39adf1f2715f30b5ed2acc6c8d040986 Mon Sep 17 00:00:00 2001 From: Aikar 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 cc115cc3..4947249d 100644 +index cc115cc368..4947249da2 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 cc115cc3..4947249d 100644 @Override -- -2.25.1.windows.1 +2.26.2 diff --git a/Spigot-Server-Patches/0272-Use-ConcurrentHashMap-in-JsonList.patch b/Spigot-Server-Patches/0272-Use-ConcurrentHashMap-in-JsonList.patch index 1292d46d00..1d8fe30fe2 100644 --- a/Spigot-Server-Patches/0272-Use-ConcurrentHashMap-in-JsonList.patch +++ b/Spigot-Server-Patches/0272-Use-ConcurrentHashMap-in-JsonList.patch @@ -1,4 +1,4 @@ -From b83898f26a8b24c740b4b6c581dd0fa2d5877415 Mon Sep 17 00:00:00 2001 +From 0edf8b199c7d8b20147ea12884d746bb6211223d 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 734e7ecf..8570e38f 100644 +index 734e7ecf63..8570e38f42 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 734e7ecf..8570e38f 100644 String s = this.b.toJson(collection); BufferedWriter bufferedwriter = null; -- -2.25.1.windows.1 +2.26.2 diff --git a/Spigot-Server-Patches/0273-Use-a-Queue-for-Queueing-Commands.patch b/Spigot-Server-Patches/0273-Use-a-Queue-for-Queueing-Commands.patch index e0329d24a3..78e62629eb 100644 --- a/Spigot-Server-Patches/0273-Use-a-Queue-for-Queueing-Commands.patch +++ b/Spigot-Server-Patches/0273-Use-a-Queue-for-Queueing-Commands.patch @@ -1,4 +1,4 @@ -From 89eee188e06b61bc10b1ead166c78418b3af806a Mon Sep 17 00:00:00 2001 +From 56312a5df0fc948f356c222101ee31c1988b6c26 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,7 +6,7 @@ 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 ec257ba3..349a0ea2 100644 +index ec257ba31f..349a0ea213 100644 --- a/src/main/java/net/minecraft/server/DedicatedServer.java +++ b/src/main/java/net/minecraft/server/DedicatedServer.java @@ -44,7 +44,7 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer @@ -32,5 +32,5 @@ index ec257ba3..349a0ea2 100644 // CraftBukkit start - ServerCommand for preprocessing ServerCommandEvent event = new ServerCommandEvent(console, servercommand.command); -- -2.25.1.windows.1 +2.26.2 diff --git a/Spigot-Server-Patches/0274-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch b/Spigot-Server-Patches/0274-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch index db08697c33..913e0b2167 100644 --- a/Spigot-Server-Patches/0274-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch +++ b/Spigot-Server-Patches/0274-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch @@ -1,4 +1,4 @@ -From 00fc1c9b2d7df8240b1394db6acea1956fd96df7 Mon Sep 17 00:00:00 2001 +From e97f5e8c7eb37ad6d34ffd5ccf217ae7c311d941 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/Spigot-Server-Patches/0275-Allow-disabling-armour-stand-ticking.patch b/Spigot-Server-Patches/0275-Allow-disabling-armour-stand-ticking.patch index 35924adffd..5f39a1a0c7 100644 --- a/Spigot-Server-Patches/0275-Allow-disabling-armour-stand-ticking.patch +++ b/Spigot-Server-Patches/0275-Allow-disabling-armour-stand-ticking.patch @@ -1,4 +1,4 @@ -From 189c94171b5014708f96dd11d18d01de927a959f Mon Sep 17 00:00:00 2001 +From 0f694cad7efeeb3e4e5e72988582d3f14410eb01 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 diff --git a/Spigot-Server-Patches/0276-Optimize-BlockPosition-helper-methods.patch b/Spigot-Server-Patches/0276-Optimize-BlockPosition-helper-methods.patch index f00ee3b1cf..e29a50f3d0 100644 --- a/Spigot-Server-Patches/0276-Optimize-BlockPosition-helper-methods.patch +++ b/Spigot-Server-Patches/0276-Optimize-BlockPosition-helper-methods.patch @@ -1,4 +1,4 @@ -From ea0915386eeeb48a5e4a3d1505a42c03c9f4cde0 Mon Sep 17 00:00:00 2001 +From 6a84b31821280f6e8e2fdf3083bd6cc4b6ebf45a 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 e9ea232a..e76528f1 100644 +index e9ea232a78..e76528f199 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 e9ea232a..e76528f1 100644 @Override -- -2.25.1.windows.1 +2.26.2 diff --git a/Spigot-Server-Patches/0277-Send-nearby-packets-from-world-player-list-not-serve.patch b/Spigot-Server-Patches/0277-Send-nearby-packets-from-world-player-list-not-serve.patch index 565acd1ea8..081adcc06c 100644 --- a/Spigot-Server-Patches/0277-Send-nearby-packets-from-world-player-list-not-serve.patch +++ b/Spigot-Server-Patches/0277-Send-nearby-packets-from-world-player-list-not-serve.patch @@ -1,4 +1,4 @@ -From f78ff17681e1dabb3b988a034059b47107e65b16 Mon Sep 17 00:00:00 2001 +From 2e6731ef91c1c7aedbd85382dc6dca59fe98f21b 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 @@ -68,10 +68,10 @@ index 8d292604c3..09176e6040 100644 } diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -index 7d2d6566b2..49055d48b5 100644 +index 960e29cb16..c7c75a3bfd 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -@@ -2126,7 +2126,7 @@ public class CraftWorld implements World { +@@ -2124,7 +2124,7 @@ public class CraftWorld implements World { double z = loc.getZ(); PacketPlayOutCustomSoundEffect packet = new PacketPlayOutCustomSoundEffect(new MinecraftKey(sound), SoundCategory.valueOf(category.name()), new Vec3D(x, y, z), volume, pitch); diff --git a/Spigot-Server-Patches/0278-Restore-vanlla-default-mob-spawn-range.patch b/Spigot-Server-Patches/0278-Restore-vanlla-default-mob-spawn-range.patch index 010d871aff..0961c77b93 100644 --- a/Spigot-Server-Patches/0278-Restore-vanlla-default-mob-spawn-range.patch +++ b/Spigot-Server-Patches/0278-Restore-vanlla-default-mob-spawn-range.patch @@ -1,11 +1,11 @@ -From 4adf68d34719a18581759afd2b38ceab59fef9a8 Mon Sep 17 00:00:00 2001 +From 9545c703849eae9dbe3518a079c92cfd51d1ada1 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 3cd66886..5e932a5d 100644 +index 3cd66886cd..5e932a5d97 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 3cd66886..5e932a5d 100644 } -- -2.25.1.windows.1 +2.26.2 diff --git a/Spigot-Server-Patches/0279-Optimize-CraftBlockData-Creation.patch b/Spigot-Server-Patches/0279-Optimize-CraftBlockData-Creation.patch index d9a34c587b..693c3524df 100644 --- a/Spigot-Server-Patches/0279-Optimize-CraftBlockData-Creation.patch +++ b/Spigot-Server-Patches/0279-Optimize-CraftBlockData-Creation.patch @@ -1,4 +1,4 @@ -From fff3f39209b3ec563dec9442cdbefc85d5ce8dd9 Mon Sep 17 00:00:00 2001 +From 8cbae9829bbc9d13db75e6d7c784d574ee0ee748 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 9ab57be8..c1ff62aa 100644 +index 9ab57be850..c1ff62aa52 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 9ab57be8..c1ff62aa 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 683b17a0..a0746a16 100644 +index 683b17a0c9..a0746a1694 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 683b17a0..a0746a16 100644 } } -- -2.25.1.windows.1 +2.26.2 diff --git a/Spigot-Server-Patches/0280-Fix-MC-124320.patch b/Spigot-Server-Patches/0280-Fix-MC-124320.patch index 45943811d0..16145d5c5d 100644 --- a/Spigot-Server-Patches/0280-Fix-MC-124320.patch +++ b/Spigot-Server-Patches/0280-Fix-MC-124320.patch @@ -1,11 +1,11 @@ -From 757409f99b57549649bd4c5769a7669494f201f6 Mon Sep 17 00:00:00 2001 +From 008099f78817ef8b4132f086d2415d82ccadf3ea 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 5f261b9b..b9b750c3 100644 +index 5f261b9b92..b9b750c369 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 5f261b9b..b9b750c3 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 b7c67f0c..d86f76f3 100644 +index b7c67f0cdb..d86f76f30b 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 b7c67f0c..d86f76f3 100644 if (iblockdata2 != null && this.a(world, blockposition, iblockdata2, iblockdata, iblockdata1, blockposition1)) { // CraftBukkit start - Place event -- -2.25.1.windows.1 +2.26.2 diff --git a/Spigot-Server-Patches/0281-Slime-Pathfinder-Events.patch b/Spigot-Server-Patches/0281-Slime-Pathfinder-Events.patch index ec36e9a186..4e521ec1a6 100644 --- a/Spigot-Server-Patches/0281-Slime-Pathfinder-Events.patch +++ b/Spigot-Server-Patches/0281-Slime-Pathfinder-Events.patch @@ -1,11 +1,11 @@ -From 04d57c4de9c3435cf2294fde4d27ae8ccf76fe7f Mon Sep 17 00:00:00 2001 +From 4e483e55d7b47ae06a60e823014867bc219efea0 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 3ecf7321..2efc18df 100644 +index 3ecf732192..2efc18df94 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 3ecf7321..2efc18df 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 ce6ed6e8..6e9f1b66 100644 +index ce6ed6e890..6e9f1b66df 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 ce6ed6e8..6e9f1b66 100644 + // Paper end } -- -2.25.1.windows.1 +2.26.2 diff --git a/Spigot-Server-Patches/0282-Configurable-speed-for-water-flowing-over-lava.patch b/Spigot-Server-Patches/0282-Configurable-speed-for-water-flowing-over-lava.patch index e88a14e81c..36e3249aff 100644 --- a/Spigot-Server-Patches/0282-Configurable-speed-for-water-flowing-over-lava.patch +++ b/Spigot-Server-Patches/0282-Configurable-speed-for-water-flowing-over-lava.patch @@ -1,11 +1,11 @@ -From 15c67414bd3b3841caf54447dc1222ed9ce200fd Mon Sep 17 00:00:00 2001 +From 0ac0e7a4cd03455e9c19b06cb18957e9218aac23 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/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index bc3df01a..487b0d5c 100644 +index bc3df01aab..487b0d5cd6 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java @@ -399,4 +399,10 @@ public class PaperWorldConfig { @@ -20,7 +20,7 @@ index bc3df01a..487b0d5c 100644 + } } diff --git a/src/main/java/net/minecraft/server/BlockFluids.java b/src/main/java/net/minecraft/server/BlockFluids.java -index f56e14e1..6d351f09 100644 +index f56e14e1e2..6d351f0979 100644 --- a/src/main/java/net/minecraft/server/BlockFluids.java +++ b/src/main/java/net/minecraft/server/BlockFluids.java @@ -70,11 +70,28 @@ public class BlockFluids extends Block implements IFluidSource { @@ -63,5 +63,5 @@ index f56e14e1..6d351f09 100644 } -- -2.25.1.windows.1 +2.26.2 diff --git a/Spigot-Server-Patches/0283-Optimize-RegistryMaterials.patch b/Spigot-Server-Patches/0283-Optimize-RegistryMaterials.patch index 57773de299..d10a2a88b3 100644 --- a/Spigot-Server-Patches/0283-Optimize-RegistryMaterials.patch +++ b/Spigot-Server-Patches/0283-Optimize-RegistryMaterials.patch @@ -1,4 +1,4 @@ -From c3732af7e8535275708cd94d5d135fa29b0bd9a0 Mon Sep 17 00:00:00 2001 +From 1bf9590e979cd9ffaa3c3a10b3c6f70e7d6b1a4e 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 2d6a7b3a..8477febc 100644 +index 2d6a7b3a47..8477febca2 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 2d6a7b3a..8477febc 100644 } } -- -2.25.1.windows.1 +2.26.2 diff --git a/Spigot-Server-Patches/0284-Add-PhantomPreSpawnEvent.patch b/Spigot-Server-Patches/0284-Add-PhantomPreSpawnEvent.patch index 38e9dcf4df..5bab5af4ad 100644 --- a/Spigot-Server-Patches/0284-Add-PhantomPreSpawnEvent.patch +++ b/Spigot-Server-Patches/0284-Add-PhantomPreSpawnEvent.patch @@ -1,11 +1,11 @@ -From 5e27e8d5bdc8fc534f405757690bc097819a6767 Mon Sep 17 00:00:00 2001 +From a3271c66f900d1403afb5ae7a4275feb63df5cf0 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 b62a8227..82323bf4 100644 +index b62a8227b2..82323bf4ac 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 b62a8227..82323bf4 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 add566ea..f488c22e 100644 +index add566ea4f..f488c22ed6 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 add566ea..f488c22e 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 9f9ee923..2b973136 100644 +index 9f9ee92390..2b97313694 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 9f9ee923..2b973136 100644 + // Paper end } -- -2.25.1.windows.1 +2.26.2 diff --git a/Spigot-Server-Patches/0285-Add-More-Creeper-API.patch b/Spigot-Server-Patches/0285-Add-More-Creeper-API.patch index 19c9ee21e0..dc02246f72 100644 --- a/Spigot-Server-Patches/0285-Add-More-Creeper-API.patch +++ b/Spigot-Server-Patches/0285-Add-More-Creeper-API.patch @@ -1,11 +1,11 @@ -From 47e5b03171d034db36f02ac6dbab155184e3f46e Mon Sep 17 00:00:00 2001 +From a8e48381835873a374f85d757a90c4249a4126fc 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 b8953007..45dfc810 100644 +index b895300797..45dfc8104a 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 b8953007..45dfc810 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 89640514..075a5e77 100644 +index 896405148c..075a5e77e2 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 89640514..075a5e77 100644 + // Paper end } -- -2.25.1.windows.1 +2.26.2 diff --git a/Spigot-Server-Patches/0286-Inventory-removeItemAnySlot.patch b/Spigot-Server-Patches/0286-Inventory-removeItemAnySlot.patch index 2f084fb72e..35356e1d9e 100644 --- a/Spigot-Server-Patches/0286-Inventory-removeItemAnySlot.patch +++ b/Spigot-Server-Patches/0286-Inventory-removeItemAnySlot.patch @@ -1,11 +1,11 @@ -From 4dc9d2ec2628aeb210f80aac4a3ce48407811202 Mon Sep 17 00:00:00 2001 +From 1f78439a77951b8ff23d7a77ff4a501f191cf5d9 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 0d637e20..026a0c39 100644 +index acc2a57ff2..47827fbf1b 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 0d637e20..026a0c39 100644 // Drat! we don't have this type in the inventory if (first == -1) { -- -2.25.1.windows.1 +2.26.2 diff --git a/Spigot-Server-Patches/0287-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch b/Spigot-Server-Patches/0287-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch index a3bc82b0df..d4869e3210 100644 --- a/Spigot-Server-Patches/0287-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch +++ b/Spigot-Server-Patches/0287-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch @@ -1,4 +1,4 @@ -From 6bdd4914f0674a84e457c1d9d98a35a989545b33 Mon Sep 17 00:00:00 2001 +From 2663b1c79466fc46673bfe620d5c97921cc3a668 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 49055d48b5..dee18a2e28 100644 +index c7c75a3bfd..68b1382838 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java @@ -501,7 +501,7 @@ public class CraftWorld implements World { diff --git a/Spigot-Server-Patches/0288-Add-ray-tracing-methods-to-LivingEntity.patch b/Spigot-Server-Patches/0288-Add-ray-tracing-methods-to-LivingEntity.patch index 013eb81ac1..f9b6ec36b3 100644 --- a/Spigot-Server-Patches/0288-Add-ray-tracing-methods-to-LivingEntity.patch +++ b/Spigot-Server-Patches/0288-Add-ray-tracing-methods-to-LivingEntity.patch @@ -1,4 +1,4 @@ -From 7c204fab3ce057f19616da84e0c0ef7a0c6b113d Mon Sep 17 00:00:00 2001 +From a4b0cab9f42556d2de64c4dda72531f1da7b2704 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/Spigot-Server-Patches/0289-Expose-attack-cooldown-methods-for-Player.patch b/Spigot-Server-Patches/0289-Expose-attack-cooldown-methods-for-Player.patch index 2bfaa81640..15cba3de7a 100644 --- a/Spigot-Server-Patches/0289-Expose-attack-cooldown-methods-for-Player.patch +++ b/Spigot-Server-Patches/0289-Expose-attack-cooldown-methods-for-Player.patch @@ -1,11 +1,11 @@ -From 50fce82521d2c181194520c980498495f0397c55 Mon Sep 17 00:00:00 2001 +From 859532ba285faede8f69fcc1ab08eb93a3d281f7 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 36748ccb..308ac18f 100644 +index 684978be7c..f41975165a 100644 --- a/src/main/java/net/minecraft/server/EntityHuman.java +++ b/src/main/java/net/minecraft/server/EntityHuman.java @@ -2123,14 +2123,17 @@ public abstract class EntityHuman extends EntityLiving { @@ -27,7 +27,7 @@ index 36748ccb..308ac18f 100644 this.aB = 0; } diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index 91ad5776..c7bd3015 100644 +index ffbf2b983b..a874ae6758 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -1905,6 +1905,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player { @@ -52,5 +52,5 @@ index 91ad5776..c7bd3015 100644 private final Player.Spigot spigot = new Player.Spigot() { -- -2.25.1.windows.1 +2.26.2 diff --git a/Spigot-Server-Patches/0290-Improve-death-events.patch b/Spigot-Server-Patches/0290-Improve-death-events.patch index 24e3bb6735..6f8a95cac5 100644 --- a/Spigot-Server-Patches/0290-Improve-death-events.patch +++ b/Spigot-Server-Patches/0290-Improve-death-events.patch @@ -1,4 +1,4 @@ -From 0266ed2e47f1d4c2683da3b22d2512359e6239a9 Mon Sep 17 00:00:00 2001 +From 958ec5362357185720cff989ca07db0267a18f81 Mon Sep 17 00:00:00 2001 From: Phoenix616 Date: Tue, 21 Aug 2018 01:39:35 +0100 Subject: [PATCH] Improve death events @@ -378,10 +378,10 @@ index a874ae6758..a8f46ceb4b 100644 public void injectScaledMaxHealth(Collection collection, boolean force) { diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -index 80e0afad50..f14689bc02 100644 +index 5088257e11..fcf2b190aa 100644 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -@@ -749,9 +749,16 @@ public class CraftEventFactory { +@@ -756,9 +756,16 @@ public class CraftEventFactory { public static EntityDeathEvent callEntityDeathEvent(EntityLiving victim, List drops) { CraftLivingEntity entity = (CraftLivingEntity) victim.getBukkitEntity(); EntityDeathEvent event = new EntityDeathEvent(entity, drops, victim.getExpReward()); @@ -398,7 +398,7 @@ index 80e0afad50..f14689bc02 100644 victim.expToDrop = event.getDroppedExp(); for (org.bukkit.inventory.ItemStack stack : event.getDrops()) { -@@ -767,8 +774,15 @@ public class CraftEventFactory { +@@ -774,8 +781,15 @@ public class CraftEventFactory { CraftPlayer entity = victim.getBukkitEntity(); PlayerDeathEvent event = new PlayerDeathEvent(entity, drops, victim.getExpReward(), 0, deathMessage); event.setKeepInventory(keepInventory); @@ -414,7 +414,7 @@ index 80e0afad50..f14689bc02 100644 victim.keepLevel = event.getKeepLevel(); victim.newLevel = event.getNewLevel(); -@@ -785,6 +799,31 @@ public class CraftEventFactory { +@@ -792,6 +806,31 @@ public class CraftEventFactory { return event; } diff --git a/Spigot-Server-Patches/0291-Allow-chests-to-be-placed-with-NBT-data.patch b/Spigot-Server-Patches/0291-Allow-chests-to-be-placed-with-NBT-data.patch index 6249164033..7af109b3a8 100644 --- a/Spigot-Server-Patches/0291-Allow-chests-to-be-placed-with-NBT-data.patch +++ b/Spigot-Server-Patches/0291-Allow-chests-to-be-placed-with-NBT-data.patch @@ -1,11 +1,11 @@ -From 6e4fca561d5f911253c660b4a0efa1651ac22608 Mon Sep 17 00:00:00 2001 +From 3babc1413f1f374fdf51cca4a3ba39d8fddb385b 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 0b0c3c68..d953cdef 100644 +index 0b0c3c681c..d953cdef14 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 0b0c3c68..d953cdef 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 c4766f72..b22bd06e 100644 +index c4766f729f..b22bd06e27 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 c4766f72..b22bd06e 100644 // CraftBukkit end } -- -2.25.1.windows.1 +2.26.2 diff --git a/Spigot-Server-Patches/0292-Mob-Pathfinding-API.patch b/Spigot-Server-Patches/0292-Mob-Pathfinding-API.patch index 39dc122e41..71c0c6ef8a 100644 --- a/Spigot-Server-Patches/0292-Mob-Pathfinding-API.patch +++ b/Spigot-Server-Patches/0292-Mob-Pathfinding-API.patch @@ -1,4 +1,4 @@ -From c1aa632f06a543b640466a0914defd71cd868916 Mon Sep 17 00:00:00 2001 +From 28c0cfc28117c3ceaf82b2b72d256b8571fa9cfb 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 00000000..f68a07cb +index 0000000000..f68a07cb96 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/entity/PaperPathfinder.java @@ -0,0 +1,111 @@ @@ -123,7 +123,7 @@ index 00000000..f68a07cb + } +} diff --git a/src/main/java/net/minecraft/server/NavigationAbstract.java b/src/main/java/net/minecraft/server/NavigationAbstract.java -index bdd092e4..f0676497 100644 +index bdd092e49d..f06764973f 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 bdd092e4..f0676497 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 312352ef..dcb4e250 100644 +index 312352ef84..dcb4e25080 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 312352ef..dcb4e250 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 b1db95da..18cdd2a6 100644 +index b1db95daa9..18cdd2a6f2 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 b1db95da..18cdd2a6 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 90e63fbf..c89bc702 100644 +index 90e63fbf29..c89bc7024b 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 90e63fbf..c89bc702 100644 public void setTarget(LivingEntity target) { EntityInsentient entity = getHandle(); -- -2.25.1.windows.1 +2.26.2 diff --git a/Spigot-Server-Patches/0293-Prevent-chunk-loading-from-Fluid-Flowing.patch b/Spigot-Server-Patches/0293-Prevent-chunk-loading-from-Fluid-Flowing.patch index cf3b971e99..55aefec33b 100644 --- a/Spigot-Server-Patches/0293-Prevent-chunk-loading-from-Fluid-Flowing.patch +++ b/Spigot-Server-Patches/0293-Prevent-chunk-loading-from-Fluid-Flowing.patch @@ -1,11 +1,11 @@ -From cd5e978ef109b1f4f9893313c4d1649bc673507d Mon Sep 17 00:00:00 2001 +From e9127720820334c5b2393932c09d747b142017d7 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 3099a5e6..376dca18 100644 +index 3099a5e654..376dca1889 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 3099a5e6..376dca18 100644 Fluid fluid = (Fluid) pair.getSecond(); Fluid fluid1 = this.a(iworldreader, blockposition1, iblockdata1); -- -2.25.1.windows.1 +2.26.2 diff --git a/Spigot-Server-Patches/0294-Implement-an-API-for-CanPlaceOn-and-CanDestroy-NBT-v.patch b/Spigot-Server-Patches/0294-Implement-an-API-for-CanPlaceOn-and-CanDestroy-NBT-v.patch index aa52f09b3c..8b26091ba2 100644 --- a/Spigot-Server-Patches/0294-Implement-an-API-for-CanPlaceOn-and-CanDestroy-NBT-v.patch +++ b/Spigot-Server-Patches/0294-Implement-an-API-for-CanPlaceOn-and-CanDestroy-NBT-v.patch @@ -1,11 +1,11 @@ -From 7f50ea4acc7bed222f5809dbec932bbe1657ea73 Mon Sep 17 00:00:00 2001 +From 1cc34abf686a0145ad4ba15f66f5d090e7e163ab 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 005ebec2..97d85f84 100644 +index 005ebec266..97d85f8451 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 005ebec2..97d85f84 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 0682c6e8..cdd262d8 100644 +index 15d27001e8..c28ea1cef0 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 0682c6e8..cdd262d8 100644 + // Paper end } -- -2.25.1.windows.1 +2.26.2 diff --git a/Spigot-Server-Patches/0295-Prevent-Mob-AI-Rules-from-Loading-Chunks.patch b/Spigot-Server-Patches/0295-Prevent-Mob-AI-Rules-from-Loading-Chunks.patch index ce771a7235..215be6f71d 100644 --- a/Spigot-Server-Patches/0295-Prevent-Mob-AI-Rules-from-Loading-Chunks.patch +++ b/Spigot-Server-Patches/0295-Prevent-Mob-AI-Rules-from-Loading-Chunks.patch @@ -1,11 +1,11 @@ -From 73807d6a1e1c09a01de6f4c8320c9d33b8ad5bf1 Mon Sep 17 00:00:00 2001 +From 76dd4b39097e8ea2c9c1de56ae047c199aa66326 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 bf8ca9b3..7ccb3d5c 100644 +index bf8ca9b32a..7ccb3d5c06 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 bf8ca9b3..7ccb3d5c 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 d4cd5091..d6a3b993 100644 +index d4cd50918b..d6a3b99339 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 d4cd5091..d6a3b993 100644 if (entitycreature.a(pathtype) == 0.0F) { -- -2.25.1.windows.1 +2.26.2 diff --git a/Spigot-Server-Patches/0296-Prevent-mob-spawning-from-loading-generating-chunks.patch b/Spigot-Server-Patches/0296-Prevent-mob-spawning-from-loading-generating-chunks.patch index de7f66e564..dacb2cea22 100644 --- a/Spigot-Server-Patches/0296-Prevent-mob-spawning-from-loading-generating-chunks.patch +++ b/Spigot-Server-Patches/0296-Prevent-mob-spawning-from-loading-generating-chunks.patch @@ -1,4 +1,4 @@ -From 6021ab3aee3fc3c4ca4c8f47288501cc78907389 Mon Sep 17 00:00:00 2001 +From e2cdd19fc08c9ffb3c7001f3efe988e118109354 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 224443e0..fdac5bb3 100644 +index 224443e03c..fdac5bb3a2 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 224443e0..fdac5bb3 100644 if (Objects.equals(chunkcoordintpair, chunk.getPos()) || worldserver.getChunkProvider().a(chunkcoordintpair)) { -- -2.25.1.windows.1 +2.26.2 diff --git a/Spigot-Server-Patches/0297-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch b/Spigot-Server-Patches/0297-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch index d55d5b7bd3..e974204c02 100644 --- a/Spigot-Server-Patches/0297-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch +++ b/Spigot-Server-Patches/0297-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch @@ -1,4 +1,4 @@ -From 4e1809b36c121e90921dd49148bfd940913925d0 Mon Sep 17 00:00:00 2001 +From 07cbb0a4da29351f0dba28bba6dfd56af972c9cd 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 253890e5..0102a170 100644 +index 253890e537..0102a170dc 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 253890e5..0102a170 100644 @Nullable -- -2.25.1.windows.1 +2.26.2 diff --git a/Spigot-Server-Patches/0298-Implement-furnace-cook-speed-multiplier-API.patch b/Spigot-Server-Patches/0298-Implement-furnace-cook-speed-multiplier-API.patch index b45aa40d6a..f0763e17da 100644 --- a/Spigot-Server-Patches/0298-Implement-furnace-cook-speed-multiplier-API.patch +++ b/Spigot-Server-Patches/0298-Implement-furnace-cook-speed-multiplier-API.patch @@ -1,4 +1,4 @@ -From d7ffcb646629d9798e43fcec8f2b30853bca1db8 Mon Sep 17 00:00:00 2001 +From 26c641106bb9ee581b0da825ccf065ce1795077d 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 560e2f42..d5432bfe 100644 +index 560e2f42b7..d5432bfeb7 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 560e2f42..d5432bfe 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 9cc67915..1ce10ea0 100644 +index 9cc67915ca..1ce10ea049 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 9cc67915..1ce10ea0 100644 + // Paper end } -- -2.25.1.windows.1 +2.26.2 diff --git a/Spigot-Server-Patches/0299-Support-Overriding-World-Seeds.patch b/Spigot-Server-Patches/0299-Support-Overriding-World-Seeds.patch index 7aaf363820..e60644b3c2 100644 --- a/Spigot-Server-Patches/0299-Support-Overriding-World-Seeds.patch +++ b/Spigot-Server-Patches/0299-Support-Overriding-World-Seeds.patch @@ -1,4 +1,4 @@ -From 722041c70e153af4c02d42be466ed8d5377e09b2 Mon Sep 17 00:00:00 2001 +From 931ba2eb4a1ff18a65fa4918ad652d8e62ae1925 Mon Sep 17 00:00:00 2001 From: Aikar Date: Mon, 17 Sep 2018 23:05:31 -0400 Subject: [PATCH] Support Overriding World Seeds diff --git a/Spigot-Server-Patches/0300-Optimize-Server-World-Map.patch b/Spigot-Server-Patches/0300-Optimize-Server-World-Map.patch index 3ef435711c..c24abefe39 100644 --- a/Spigot-Server-Patches/0300-Optimize-Server-World-Map.patch +++ b/Spigot-Server-Patches/0300-Optimize-Server-World-Map.patch @@ -1,4 +1,4 @@ -From cff5d9292ccb5e528a27ab5afcc8959958842286 Mon Sep 17 00:00:00 2001 +From bfca608152278c4316f92fbd0b8b1af9f4374133 Mon Sep 17 00:00:00 2001 From: Aikar 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 00000000..6bb2f98b +index 0000000000..6bb2f98b45 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/PaperWorldMap.java @@ -0,0 +1,191 @@ @@ -217,7 +217,7 @@ index 00000000..6bb2f98b + } +} diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 6c6e8eae..e7197f20 100644 +index ec4ce59c5e..c97bbe933d 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 43c491f7..cb7cb789 100644 +index 43c491f71b..cb7cb789b8 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 43c491f7..cb7cb789 100644 if (!event.callEvent()) { flag = true; -- -2.25.1.windows.1 +2.26.2 diff --git a/Spigot-Server-Patches/0302-Catch-JsonParseException-in-Entity-and-TE-names.patch b/Spigot-Server-Patches/0302-Catch-JsonParseException-in-Entity-and-TE-names.patch index d8cca769e3..4bb3d27c1f 100644 --- a/Spigot-Server-Patches/0302-Catch-JsonParseException-in-Entity-and-TE-names.patch +++ b/Spigot-Server-Patches/0302-Catch-JsonParseException-in-Entity-and-TE-names.patch @@ -1,4 +1,4 @@ -From 3a7c408083a0e6bcb430d26dfa7471c7700a7f1f Mon Sep 17 00:00:00 2001 +From 8c71da1c2ec85763d440f6203c47a63d47524c9a 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 78671229..ef2a496e 100644 +index 7867122974..ef2a496eda 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 78671229..ef2a496e 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 09c57605..d1ab124f 100644 +index 09bb8676c3..8d3140871f 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 09c57605..d1ab124f 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 9d0b0c9f..3342278b 100644 +index 9d0b0c9fc3..3342278bcd 100644 --- a/src/main/java/net/minecraft/server/MCUtil.java +++ b/src/main/java/net/minecraft/server/MCUtil.java @@ -437,4 +437,19 @@ public final class MCUtil { @@ -63,7 +63,7 @@ index 9d0b0c9f..3342278b 100644 + } } diff --git a/src/main/java/net/minecraft/server/TileEntityBanner.java b/src/main/java/net/minecraft/server/TileEntityBanner.java -index 93911a82..d35604ed 100644 +index 93911a8251..d35604edb2 100644 --- a/src/main/java/net/minecraft/server/TileEntityBanner.java +++ b/src/main/java/net/minecraft/server/TileEntityBanner.java @@ -60,7 +60,7 @@ public class TileEntityBanner extends TileEntity implements INamableTileEntity { @@ -76,7 +76,7 @@ index 93911a82..d35604ed 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 473ec2cb..ab6b86e4 100644 +index 473ec2cbde..ab6b86e4e9 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 473ec2cb..ab6b86e4 100644 } -- -2.25.1.windows.1 +2.26.2 diff --git a/Spigot-Server-Patches/0303-Avoid-dimension-id-collisions.patch b/Spigot-Server-Patches/0303-Avoid-dimension-id-collisions.patch index b846a31a42..48d7c247b5 100644 --- a/Spigot-Server-Patches/0303-Avoid-dimension-id-collisions.patch +++ b/Spigot-Server-Patches/0303-Avoid-dimension-id-collisions.patch @@ -1,4 +1,4 @@ -From 1bbb0075a34dc8bc194419cbf70187d760c3a3a7 Mon Sep 17 00:00:00 2001 +From 2e8eb9ce52805d60b6e93d8420e6e0c1d46f3ba7 Mon Sep 17 00:00:00 2001 From: Brokkonaut Date: Tue, 25 Sep 2018 06:53:43 +0200 Subject: [PATCH] Avoid dimension id collisions diff --git a/Spigot-Server-Patches/0304-Honor-EntityAgeable.ageLock.patch b/Spigot-Server-Patches/0304-Honor-EntityAgeable.ageLock.patch index 9feb705846..a1ce2f9f23 100644 --- a/Spigot-Server-Patches/0304-Honor-EntityAgeable.ageLock.patch +++ b/Spigot-Server-Patches/0304-Honor-EntityAgeable.ageLock.patch @@ -1,11 +1,11 @@ -From 300de9c618a02d1da412658208b03742479959f9 Mon Sep 17 00:00:00 2001 +From e751b2c78be84acb0f93003c3b6b58b95d36d847 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 cec93843..3d27f096 100644 +index cec938436d..3d27f0964a 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 cec93843..3d27f096 100644 int k = j; -- -2.25.1.windows.1 +2.26.2 diff --git a/Spigot-Server-Patches/0305-Configurable-connection-throttle-kick-message.patch b/Spigot-Server-Patches/0305-Configurable-connection-throttle-kick-message.patch index c2be311dd1..c159747512 100644 --- a/Spigot-Server-Patches/0305-Configurable-connection-throttle-kick-message.patch +++ b/Spigot-Server-Patches/0305-Configurable-connection-throttle-kick-message.patch @@ -1,11 +1,11 @@ -From 58a0ed1dff62d1555b8ec0fb242a201daf078077 Mon Sep 17 00:00:00 2001 +From 2cb571fbec4d4eb265905318ef52688402ac7dae 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 559e6b42..092bff78 100644 +index 559e6b42ba..092bff78ab 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 559e6b42..092bff78 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 8928d93e..0532f975 100644 +index 8928d93e49..0532f975b7 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 8928d93e..0532f975 100644 this.b.close(chatmessage); return; -- -2.25.1.windows.1 +2.26.2 diff --git a/Spigot-Server-Patches/0306-Hook-into-CB-plugin-rewrites.patch b/Spigot-Server-Patches/0306-Hook-into-CB-plugin-rewrites.patch index 1afcd47d4c..12fddf0d15 100644 --- a/Spigot-Server-Patches/0306-Hook-into-CB-plugin-rewrites.patch +++ b/Spigot-Server-Patches/0306-Hook-into-CB-plugin-rewrites.patch @@ -1,4 +1,4 @@ -From c6ce71433a501052c132a80729e6f87ad726a10a Mon Sep 17 00:00:00 2001 +From 491d3e52a6cfdeff2c5e7345a425065940c3b610 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 diff --git a/Spigot-Server-Patches/0307-Allow-setting-the-vex-s-summoner.patch b/Spigot-Server-Patches/0307-Allow-setting-the-vex-s-summoner.patch index b993340006..5da609a8b2 100644 --- a/Spigot-Server-Patches/0307-Allow-setting-the-vex-s-summoner.patch +++ b/Spigot-Server-Patches/0307-Allow-setting-the-vex-s-summoner.patch @@ -1,11 +1,11 @@ -From 373a890a522dad9ebad8b778f93eff7f3e339a55 Mon Sep 17 00:00:00 2001 +From a913394f33682be1c271f6f27d3adc87a3ac6ee6 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 a4673046..cf274666 100644 +index a46730460e..cf274666c7 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 a4673046..cf274666 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 169c951e..2f7df307 100644 +index 169c951ec3..2f7df3074f 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 169c951e..2f7df307 100644 @Override -- -2.25.1.windows.1 +2.26.2 diff --git a/Spigot-Server-Patches/0308-Add-sun-related-API.patch b/Spigot-Server-Patches/0308-Add-sun-related-API.patch index 2d6349bb68..3d6bd5edd3 100644 --- a/Spigot-Server-Patches/0308-Add-sun-related-API.patch +++ b/Spigot-Server-Patches/0308-Add-sun-related-API.patch @@ -1,4 +1,4 @@ -From 6a8e02eb2416fef7e2a34cd423a75dd80a2bc64f Mon Sep 17 00:00:00 2001 +From 1fabbbe82e93caaac0537f11d08c90fa2bd4446b Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Sun, 7 Oct 2018 00:54:21 -0500 Subject: [PATCH] Add sun related API @@ -17,10 +17,10 @@ index b5816dc89e..bed15873b6 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 dee18a2e28..b9a4c21ab5 100644 +index 68b1382838..db31b17b87 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 { +@@ -860,6 +860,13 @@ public class CraftWorld implements World { } } diff --git a/Spigot-Server-Patches/0309-Check-Drowned-for-Villager-Aggression-Config.patch b/Spigot-Server-Patches/0309-Check-Drowned-for-Villager-Aggression-Config.patch index cbf22592b6..55b09dc837 100644 --- a/Spigot-Server-Patches/0309-Check-Drowned-for-Villager-Aggression-Config.patch +++ b/Spigot-Server-Patches/0309-Check-Drowned-for-Villager-Aggression-Config.patch @@ -1,11 +1,11 @@ -From 012140bfe4d41e36b163c7a27f200413683ec3a4 Mon Sep 17 00:00:00 2001 +From f1440d0aa565de2d6ebe2f44a1a8fe985911cea3 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 70c06ca7..77885f67 100644 +index 70c06ca775..77885f67ff 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 70c06ca7..77885f67 100644 this.targetSelector.a(5, new PathfinderGoalNearestAttackableTarget<>(this, EntityTurtle.class, 10, true, false, EntityTurtle.bw)); } -- -2.25.1.windows.1 +2.26.2 diff --git a/Spigot-Server-Patches/0310-Here-s-Johnny.patch b/Spigot-Server-Patches/0310-Here-s-Johnny.patch index d7d6650633..6581fcd8c0 100644 --- a/Spigot-Server-Patches/0310-Here-s-Johnny.patch +++ b/Spigot-Server-Patches/0310-Here-s-Johnny.patch @@ -1,11 +1,11 @@ -From c59690eed8ad60eb841233b638fb0d95c85de0e4 Mon Sep 17 00:00:00 2001 +From 305a2f3389056f221a0609f93a40a295651149b1 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 73ecdd22..c974c02e 100644 +index 73ecdd22ea..c974c02e92 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 73ecdd22..c974c02e 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 951d4792..5ff957ce 100644 +index 951d479298..5ff957ced7 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 951d4792..5ff957ce 100644 + // Paper end } -- -2.25.1.windows.1 +2.26.2 diff --git a/Spigot-Server-Patches/0311-Turtle-API.patch b/Spigot-Server-Patches/0311-Turtle-API.patch index fcee8d7743..2336396f4c 100644 --- a/Spigot-Server-Patches/0311-Turtle-API.patch +++ b/Spigot-Server-Patches/0311-Turtle-API.patch @@ -1,11 +1,11 @@ -From 8cad9ca1f86f66b4a61c7d2d623d0aee7207a14d Mon Sep 17 00:00:00 2001 +From cec55ad267260fe7ca85b88fb2c215d58fa99a5d 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 76296119..dd02cb34 100644 +index 76296119a1..dd02cb3485 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 76296119..dd02cb34 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 123a2c75..8edcf7af 100644 +index 123a2c75ca..8edcf7af65 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 123a2c75..8edcf7af 100644 + // Paper end } -- -2.25.1.windows.1 +2.26.2 diff --git a/Spigot-Server-Patches/0312-Limit-lightning-strike-effect-distance.patch b/Spigot-Server-Patches/0312-Limit-lightning-strike-effect-distance.patch index 077cf3d74c..08833da572 100644 --- a/Spigot-Server-Patches/0312-Limit-lightning-strike-effect-distance.patch +++ b/Spigot-Server-Patches/0312-Limit-lightning-strike-effect-distance.patch @@ -1,11 +1,11 @@ -From 192c8957493a4417522392c8fc399551b121c017 Mon Sep 17 00:00:00 2001 +From 264d561286c4bbb3bbff2fb8aba17192c2655275 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 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index 487b0d5c..b8789c8e 100644 +index 487b0d5cd6..b8789c8ecc 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java @@ -242,6 +242,28 @@ public class PaperWorldConfig { @@ -38,7 +38,7 @@ index 487b0d5c..b8789c8e 100644 private void fixedInhabitedTime() { if (PaperConfig.version < 16) { diff --git a/src/main/java/net/minecraft/server/EntityLightning.java b/src/main/java/net/minecraft/server/EntityLightning.java -index 7c518983..bdb534de 100644 +index 7c518983a9..bdb534deb4 100644 --- a/src/main/java/net/minecraft/server/EntityLightning.java +++ b/src/main/java/net/minecraft/server/EntityLightning.java @@ -64,6 +64,17 @@ public class EntityLightning extends Entity { @@ -69,7 +69,7 @@ index 7c518983..bdb534de 100644 --this.lifeTicks; diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java -index 09176e60..43565dd9 100644 +index 09176e6040..43565dd92c 100644 --- a/src/main/java/net/minecraft/server/WorldServer.java +++ b/src/main/java/net/minecraft/server/WorldServer.java @@ -1290,7 +1290,7 @@ public class WorldServer extends World { @@ -82,5 +82,5 @@ index 09176e60..43565dd9 100644 @Override -- -2.25.1.windows.1 +2.26.2 diff --git a/Spigot-Server-Patches/0313-MC-50319-Check-other-worlds-for-shooter-of-projectil.patch b/Spigot-Server-Patches/0313-MC-50319-Check-other-worlds-for-shooter-of-projectil.patch index 9b4e02bf92..c79d8550d1 100644 --- a/Spigot-Server-Patches/0313-MC-50319-Check-other-worlds-for-shooter-of-projectil.patch +++ b/Spigot-Server-Patches/0313-MC-50319-Check-other-worlds-for-shooter-of-projectil.patch @@ -1,4 +1,4 @@ -From 17221c4cbed3895c74b4a7283c51c6ff54325d38 Mon Sep 17 00:00:00 2001 +From 7767959c5febf3b454e6d10f0f31dc318ae20a75 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 9eed1dce..6c091b68 100644 +index 9eed1dce3e..6c091b6808 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 9eed1dce..6c091b68 100644 if (entity instanceof EntityLiving) { this.shooter = (EntityLiving) entity; -- -2.25.1.windows.1 +2.26.2 diff --git a/Spigot-Server-Patches/0314-Call-player-spectator-target-events.patch b/Spigot-Server-Patches/0314-Call-player-spectator-target-events.patch index 7fafb77798..28d61a799d 100644 --- a/Spigot-Server-Patches/0314-Call-player-spectator-target-events.patch +++ b/Spigot-Server-Patches/0314-Call-player-spectator-target-events.patch @@ -1,4 +1,4 @@ -From 8b8ec3a2fefaceaeb38dacfe5251360b15ac388e Mon Sep 17 00:00:00 2001 +From f6a5881c8abe81101299f583c2b21405df79d57a 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/Spigot-Server-Patches/0315-Add-Velocity-IP-Forwarding-Support.patch b/Spigot-Server-Patches/0315-Add-Velocity-IP-Forwarding-Support.patch index 02bf8b88cf..9deaba887e 100644 --- a/Spigot-Server-Patches/0315-Add-Velocity-IP-Forwarding-Support.patch +++ b/Spigot-Server-Patches/0315-Add-Velocity-IP-Forwarding-Support.patch @@ -1,4 +1,4 @@ -From 17eecd413a0301f1fb6517449447bec95c7b9d20 Mon Sep 17 00:00:00 2001 +From 267ec2b859008af363a6f61dd9e24c9e9517864d 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 diff --git a/Spigot-Server-Patches/0316-Add-more-Witch-API.patch b/Spigot-Server-Patches/0316-Add-more-Witch-API.patch index 3cc27b0657..6de554272f 100644 --- a/Spigot-Server-Patches/0316-Add-more-Witch-API.patch +++ b/Spigot-Server-Patches/0316-Add-more-Witch-API.patch @@ -1,11 +1,11 @@ -From 59cc2d462a4a127b0fd640f234e53c85b0c57f27 Mon Sep 17 00:00:00 2001 +From 57853892b2da887cb6cd8835640d63d85c1dc1fa Mon Sep 17 00:00:00 2001 From: BillyGalbreath 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 be6ecfb0..7b6b1ad1 100644 +index be6ecfb08a..7b6b1ad17b 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 be6ecfb0..7b6b1ad1 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 bae107e7..b43a2bbd 100644 +index bae107e76e..b43a2bbd5b 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 bae107e7..b43a2bbd 100644 + // Paper end } -- -2.25.1.windows.1 +2.26.2 diff --git a/Spigot-Server-Patches/0317-Fix-MC-93764.patch b/Spigot-Server-Patches/0317-Fix-MC-93764.patch index 2249628c42..398f19b008 100644 --- a/Spigot-Server-Patches/0317-Fix-MC-93764.patch +++ b/Spigot-Server-Patches/0317-Fix-MC-93764.patch @@ -1,11 +1,11 @@ -From 55b2fbe434ab670294e3cb8ed6a65197380c66c0 Mon Sep 17 00:00:00 2001 +From 15d717629b9a92c913952b6335741ab477a62f0a 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 9d4fcf8b..4b976070 100644 +index 9d4fcf8bcf..4b9760709d 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 9d4fcf8b..4b976070 100644 @Override -- -2.25.1.windows.1 +2.26.2 diff --git a/Spigot-Server-Patches/0318-Add-option-to-prevent-players-from-moving-into-unloa.patch b/Spigot-Server-Patches/0318-Add-option-to-prevent-players-from-moving-into-unloa.patch index a8a94bc1d1..9b416d9312 100644 --- a/Spigot-Server-Patches/0318-Add-option-to-prevent-players-from-moving-into-unloa.patch +++ b/Spigot-Server-Patches/0318-Add-option-to-prevent-players-from-moving-into-unloa.patch @@ -1,4 +1,4 @@ -From e096218a75ae477d0f19cc12f797709eb34b229d Mon Sep 17 00:00:00 2001 +From 05a9dd79cc871677eac47008e454955ae3691d8b 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 @@ -6,7 +6,7 @@ Subject: [PATCH] Add option to prevent players from moving into unloaded diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index b8789c8e..0862a1d6 100644 +index b8789c8ecc..0862a1d629 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java @@ -427,4 +427,9 @@ public class PaperWorldConfig { @@ -20,7 +20,7 @@ index b8789c8e..0862a1d6 100644 + } } diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java -index 6627d840..bde60377 100644 +index 6627d8402f..bde60377ee 100644 --- a/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java @@ -351,6 +351,13 @@ public class PlayerConnection implements PacketListenerPlayIn { @@ -63,5 +63,5 @@ index 6627d840..bde60377 100644 if (!this.player.H() && (!this.player.getWorldServer().getGameRules().getBoolean(GameRules.DISABLE_ELYTRA_MOVEMENT_CHECK) || !this.player.isGliding())) { float f2 = this.player.isGliding() ? 300.0F : 100.0F; -- -2.25.1.windows.1 +2.26.2 diff --git a/Spigot-Server-Patches/0319-Reset-players-airTicks-on-respawn.patch b/Spigot-Server-Patches/0319-Reset-players-airTicks-on-respawn.patch index d4f69342f3..04e9600fc8 100644 --- a/Spigot-Server-Patches/0319-Reset-players-airTicks-on-respawn.patch +++ b/Spigot-Server-Patches/0319-Reset-players-airTicks-on-respawn.patch @@ -1,4 +1,4 @@ -From be7c95d3a46cdd0d3b6ffd858ae228cbcf351f68 Mon Sep 17 00:00:00 2001 +From 05353c0b8f4bb4fd35567ed4f5a1522468a73207 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/Spigot-Server-Patches/0320-Don-t-sleep-after-profile-lookups-if-not-needed.patch b/Spigot-Server-Patches/0320-Don-t-sleep-after-profile-lookups-if-not-needed.patch index 9b4500f360..940eb15e6d 100644 --- a/Spigot-Server-Patches/0320-Don-t-sleep-after-profile-lookups-if-not-needed.patch +++ b/Spigot-Server-Patches/0320-Don-t-sleep-after-profile-lookups-if-not-needed.patch @@ -1,4 +1,4 @@ -From fd7ce798a224b71e55dffca4fc0574cac9cb3b23 Mon Sep 17 00:00:00 2001 +From 0ba446a787156af67dac8372b5165c5237358faa 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 71e48e87..23f1447c 100644 +index 71e48e87b4..23f1447cfc 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 71e48e87..23f1447c 100644 try { Thread.sleep(DELAY_BETWEEN_PAGES); -- -2.25.1.windows.1 +2.26.2 diff --git a/Spigot-Server-Patches/0321-Use-more-reasonable-thread-count-default-for-bootstr.patch b/Spigot-Server-Patches/0321-Use-more-reasonable-thread-count-default-for-bootstr.patch index e0137d976b..ad7c9356d5 100644 --- a/Spigot-Server-Patches/0321-Use-more-reasonable-thread-count-default-for-bootstr.patch +++ b/Spigot-Server-Patches/0321-Use-more-reasonable-thread-count-default-for-bootstr.patch @@ -1,11 +1,11 @@ -From 61e890d07fb29e8986c3e371263e26ca1db4fddd Mon Sep 17 00:00:00 2001 +From 68bba7cd99d3f206e6a4e80429f6e4d90125c89b 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 7e224ebe..dc6d0306 100644 +index 7e224ebeff..dc6d030621 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 7e224ebe..dc6d0306 100644 if (i <= 0) { -- -2.25.1.windows.1 +2.26.2 diff --git a/Spigot-Server-Patches/0322-Optimize-World-Time-Updates.patch b/Spigot-Server-Patches/0322-Optimize-World-Time-Updates.patch index b8844bc2e6..2b08d08271 100644 --- a/Spigot-Server-Patches/0322-Optimize-World-Time-Updates.patch +++ b/Spigot-Server-Patches/0322-Optimize-World-Time-Updates.patch @@ -1,4 +1,4 @@ -From a9c88692d81b76abc1d47c7e59d2d1d760367b65 Mon Sep 17 00:00:00 2001 +From 0726b0e88db219ced2e6812a070c9aa60670169b Mon Sep 17 00:00:00 2001 From: Aikar Date: Fri, 2 Nov 2018 23:11:51 -0400 Subject: [PATCH] Optimize World Time Updates diff --git a/Spigot-Server-Patches/0323-Restore-custom-InventoryHolder-support.patch b/Spigot-Server-Patches/0323-Restore-custom-InventoryHolder-support.patch index 373e5e80b6..aac2e20986 100644 --- a/Spigot-Server-Patches/0323-Restore-custom-InventoryHolder-support.patch +++ b/Spigot-Server-Patches/0323-Restore-custom-InventoryHolder-support.patch @@ -1,4 +1,4 @@ -From 26f4f7687fbc57b3cab238e25aee1018f90ff602 Mon Sep 17 00:00:00 2001 +From bad8b9f72d116daeaad76187acdf82df3a62330f Mon Sep 17 00:00:00 2001 From: Shane Freeder 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 9957ed04..ae280dd4 100644 +index 9957ed0402..ae280dd40b 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 9957ed04..ae280dd4 100644 } -- -2.25.1.windows.1 +2.26.2 diff --git a/Spigot-Server-Patches/0324-Use-Vanilla-Minecart-Speeds.patch b/Spigot-Server-Patches/0324-Use-Vanilla-Minecart-Speeds.patch index 7e1b4de2e1..e74be036a3 100644 --- a/Spigot-Server-Patches/0324-Use-Vanilla-Minecart-Speeds.patch +++ b/Spigot-Server-Patches/0324-Use-Vanilla-Minecart-Speeds.patch @@ -1,4 +1,4 @@ -From 393c109b256966d94522ece6225f5b0d3d7ae1e5 Mon Sep 17 00:00:00 2001 +From 42d6aef1ce2c334a428249028bd55086efe02c3f 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 c2843d5d..665bbe07 100644 +index c2843d5d60..665bbe07fa 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 c2843d5d..665bbe07 100644 // CraftBukkit end -- -2.25.1.windows.1 +2.26.2 diff --git a/Spigot-Server-Patches/0325-Fix-SpongeAbsortEvent-handling.patch b/Spigot-Server-Patches/0325-Fix-SpongeAbsortEvent-handling.patch index 9b3cfc66f4..feff9eb990 100644 --- a/Spigot-Server-Patches/0325-Fix-SpongeAbsortEvent-handling.patch +++ b/Spigot-Server-Patches/0325-Fix-SpongeAbsortEvent-handling.patch @@ -1,4 +1,4 @@ -From 520be988fa876b725e039e91c57f47efe6d4097b Mon Sep 17 00:00:00 2001 +From 3dfa21fff39c7ccf8cd6d213d1a2e0611209ed21 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 b9b750c3..540fcce1 100644 +index b9b750c369..540fcce1dd 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 b9b750c3..540fcce1 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 685a30f3..9edf937a 100644 +index 685a30f3f1..9edf937a65 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 685a30f3..9edf937a 100644 } world.setTypeAndData(blockposition2, block.getHandle(), block.getFlag()); -- -2.25.1.windows.1 +2.26.2 diff --git a/Spigot-Server-Patches/0326-Don-t-allow-digging-into-unloaded-chunks.patch b/Spigot-Server-Patches/0326-Don-t-allow-digging-into-unloaded-chunks.patch index 5b033f7e54..e5c84b627f 100644 --- a/Spigot-Server-Patches/0326-Don-t-allow-digging-into-unloaded-chunks.patch +++ b/Spigot-Server-Patches/0326-Don-t-allow-digging-into-unloaded-chunks.patch @@ -1,11 +1,11 @@ -From 4bf4eb755781e0e5bccec65f2e5f63f92f99d03d Mon Sep 17 00:00:00 2001 +From c1dd6221baa83a8a02654cebccd95e41a1874554 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 bde60377..b21fca9e 100644 +index bde60377ee..b21fca9e5c 100644 --- a/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java @@ -1272,6 +1272,11 @@ public class PlayerConnection implements PacketListenerPlayIn { @@ -21,7 +21,7 @@ index bde60377..b21fca9e 100644 return; default: diff --git a/src/main/java/net/minecraft/server/PlayerInteractManager.java b/src/main/java/net/minecraft/server/PlayerInteractManager.java -index e2e5c17c..17b7edda 100644 +index e2e5c17c24..17b7eddac4 100644 --- a/src/main/java/net/minecraft/server/PlayerInteractManager.java +++ b/src/main/java/net/minecraft/server/PlayerInteractManager.java @@ -253,10 +253,12 @@ public class PlayerInteractManager { @@ -41,5 +41,5 @@ index e2e5c17c..17b7edda 100644 this.world.a(this.player.getId(), blockposition, -1); -- -2.25.1.windows.1 +2.26.2 diff --git a/Spigot-Server-Patches/0327-Optimize-redstone-algorithm.patch b/Spigot-Server-Patches/0327-Optimize-redstone-algorithm.patch index 6160e876bb..f92948acac 100644 --- a/Spigot-Server-Patches/0327-Optimize-redstone-algorithm.patch +++ b/Spigot-Server-Patches/0327-Optimize-redstone-algorithm.patch @@ -1,4 +1,4 @@ -From a842524bd4b511777907563e1c3b06fc5d8eddef Mon Sep 17 00:00:00 2001 +From 3779094901c0801f88f7af0477296d7f1e4990d6 Mon Sep 17 00:00:00 2001 From: theosib Date: Thu, 27 Sep 2018 01:43:35 -0600 Subject: [PATCH] Optimize redstone algorithm @@ -19,7 +19,7 @@ Aside from making the obvious class/function renames and obfhelpers I didn't nee Just added Bukkit's event system and took a few liberties with dead code and comment misspellings. diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index 0862a1d6..4ba72275 100644 +index 0862a1d629..4ba72275b9 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java @@ -432,4 +432,14 @@ public class PaperWorldConfig { @@ -39,7 +39,7 @@ index 0862a1d6..4ba72275 100644 } diff --git a/src/main/java/com/destroystokyo/paper/util/RedstoneWireTurbo.java b/src/main/java/com/destroystokyo/paper/util/RedstoneWireTurbo.java new file mode 100644 -index 00000000..b69803cb +index 0000000000..b69803cbf2 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/util/RedstoneWireTurbo.java @@ -0,0 +1,915 @@ @@ -959,7 +959,7 @@ index 00000000..b69803cb + } +} diff --git a/src/main/java/net/minecraft/server/BlockRedstoneWire.java b/src/main/java/net/minecraft/server/BlockRedstoneWire.java -index 5bf2fc0b..52a4982e 100644 +index 5bf2fc0b3f..52a4982ecd 100644 --- a/src/main/java/net/minecraft/server/BlockRedstoneWire.java +++ b/src/main/java/net/minecraft/server/BlockRedstoneWire.java @@ -1,5 +1,7 @@ @@ -1127,7 +1127,7 @@ index 5bf2fc0b..52a4982e 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 378ac5ae..f8619578 100644 +index 378ac5ae86..f861957842 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -522,6 +522,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable { @@ -1147,5 +1147,5 @@ index 378ac5ae..f8619578 100644 int i = 0; EnumDirection[] aenumdirection = World.a; -- -2.25.1.windows.1 +2.26.2 diff --git a/Spigot-Server-Patches/0328-force-entity-dismount-during-teleportation.patch b/Spigot-Server-Patches/0328-force-entity-dismount-during-teleportation.patch index 64a69179d8..71a61daae0 100644 --- a/Spigot-Server-Patches/0328-force-entity-dismount-during-teleportation.patch +++ b/Spigot-Server-Patches/0328-force-entity-dismount-during-teleportation.patch @@ -1,4 +1,4 @@ -From 63fcabba36fc0667906489add90ddab3ee362294 Mon Sep 17 00:00:00 2001 +From 9f76cc276b7f1ca39fb433ac114e356046e3727a 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 diff --git a/Spigot-Server-Patches/0329-Book-Size-Limits.patch b/Spigot-Server-Patches/0329-Book-Size-Limits.patch index b1878e336b..2a7581adba 100644 --- a/Spigot-Server-Patches/0329-Book-Size-Limits.patch +++ b/Spigot-Server-Patches/0329-Book-Size-Limits.patch @@ -1,4 +1,4 @@ -From c44f7c4272eab2b128fc19fdc0ba6aedbb52ef87 Mon Sep 17 00:00:00 2001 +From 40477e339f434baa1e125be7c40d8006db4bcd4e 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 79cf4e59..6d069c73 100644 +index 79cf4e598f..6d069c73d0 100644 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java @@ -354,4 +354,11 @@ public class PaperConfig { @@ -22,7 +22,7 @@ index 79cf4e59..6d069c73 100644 + } } diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java -index b21fca9e..784f0a3f 100644 +index b21fca9e5c..784f0a3f22 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 b21fca9e..784f0a3f 100644 // CraftBukkit start if (this.lastBookTick + 20 > MinecraftServer.currentTick) { -- -2.25.1.windows.1 +2.26.2 diff --git a/Spigot-Server-Patches/0330-Make-the-default-permission-message-configurable.patch b/Spigot-Server-Patches/0330-Make-the-default-permission-message-configurable.patch index 98e18b1fce..fca454d95a 100644 --- a/Spigot-Server-Patches/0330-Make-the-default-permission-message-configurable.patch +++ b/Spigot-Server-Patches/0330-Make-the-default-permission-message-configurable.patch @@ -1,4 +1,4 @@ -From a2a81762765b98cb4ee2353a72a0c42ab6815db6 Mon Sep 17 00:00:00 2001 +From e9d84962272f4ad3b4c1968600b6f5b265707b58 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/Spigot-Server-Patches/0331-Add-more-Zombie-API.patch b/Spigot-Server-Patches/0331-Add-more-Zombie-API.patch index d2ad5adf08..aa75d05ea7 100644 --- a/Spigot-Server-Patches/0331-Add-more-Zombie-API.patch +++ b/Spigot-Server-Patches/0331-Add-more-Zombie-API.patch @@ -1,11 +1,11 @@ -From 8a9dfa5617d4d665d739b3b13c1004e905191094 Mon Sep 17 00:00:00 2001 +From 44800da3b5b4053828869258f37eaf719ec63314 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 bed15873..6d53254f 100644 +index bed15873b6..6d53254f83 100644 --- a/src/main/java/net/minecraft/server/EntityInsentient.java +++ b/src/main/java/net/minecraft/server/EntityInsentient.java @@ -1260,6 +1260,8 @@ public abstract class EntityInsentient extends EntityLiving { @@ -18,7 +18,7 @@ index bed15873..6d53254f 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 31aba6bf..2d4f8aac 100644 +index 31aba6bfc3..2d4f8aac8f 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 31aba6bf..2d4f8aac 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 0429cf02..c4320dbb 100644 +index 0429cf020e..c4320dbb67 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 0429cf02..c4320dbb 100644 + // Paper end } -- -2.25.1.windows.1 +2.26.2 diff --git a/Spigot-Server-Patches/0332-Prevent-rayTrace-from-loading-chunks.patch b/Spigot-Server-Patches/0332-Prevent-rayTrace-from-loading-chunks.patch index 6078a558a2..136277a201 100644 --- a/Spigot-Server-Patches/0332-Prevent-rayTrace-from-loading-chunks.patch +++ b/Spigot-Server-Patches/0332-Prevent-rayTrace-from-loading-chunks.patch @@ -1,4 +1,4 @@ -From 5db13565bc74817a456fc21947d38a0eff4b2e38 Mon Sep 17 00:00:00 2001 +From aab8e3026c429cd3433d943dd79245ea6c7f5e8c 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 0dff0235..29cdc008 100644 +index 0dff023529..29cdc00875 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 0dff0235..29cdc008 100644 Vec3D vec3d = raytrace1.b(); Vec3D vec3d1 = raytrace1.a(); -- -2.25.1.windows.1 +2.26.2 diff --git a/Spigot-Server-Patches/0333-Handle-Large-Packets-disconnecting-client.patch b/Spigot-Server-Patches/0333-Handle-Large-Packets-disconnecting-client.patch index b7816aa4d9..3cd8ae6b49 100644 --- a/Spigot-Server-Patches/0333-Handle-Large-Packets-disconnecting-client.patch +++ b/Spigot-Server-Patches/0333-Handle-Large-Packets-disconnecting-client.patch @@ -1,4 +1,4 @@ -From 3fb7f3f507c5af8c22c8b3ecb3ca32f5618c4767 Mon Sep 17 00:00:00 2001 +From c0a1bbcd3eb1b579463407d12d658155d927c129 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 046196d5..d4aad8a5 100644 +index 046196d54d..d4aad8a5b7 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 046196d5..d4aad8a5 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 601d4d0f..2d8e6a2f 100644 +index 601d4d0fa2..2d8e6a2f4a 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 601d4d0f..2d8e6a2f 100644 return false; } diff --git a/src/main/java/net/minecraft/server/PacketEncoder.java b/src/main/java/net/minecraft/server/PacketEncoder.java -index 63c4dbd3..b0cfef52 100644 +index 63c4dbd327..b0cfef52cb 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 63c4dbd3..b0cfef52 100644 + // Paper end } diff --git a/src/main/java/net/minecraft/server/PacketPlayOutMapChunk.java b/src/main/java/net/minecraft/server/PacketPlayOutMapChunk.java -index 1fcbbd69..a0b87f89 100644 +index 1fcbbd698a..a0b87f89df 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 1fcbbd69..a0b87f89 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 f7c36556..63123432 100644 +index f7c3655671..631234324d 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 f7c36556..63123432 100644 public PacketPlayOutWindowItems(int i, NonNullList nonnulllist) { -- -2.25.1.windows.1 +2.26.2 diff --git a/Spigot-Server-Patches/0334-Lazy-init-world-storage-in-CraftOfflinePlayer.patch b/Spigot-Server-Patches/0334-Lazy-init-world-storage-in-CraftOfflinePlayer.patch index 3992335bda..5749d3a29b 100644 --- a/Spigot-Server-Patches/0334-Lazy-init-world-storage-in-CraftOfflinePlayer.patch +++ b/Spigot-Server-Patches/0334-Lazy-init-world-storage-in-CraftOfflinePlayer.patch @@ -1,4 +1,4 @@ -From ceddb143ea54a9658742d72aee156890cfb269c3 Mon Sep 17 00:00:00 2001 +From a7a6c01c51b445954e0449f83db2a55de7075b35 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 58e10381..0e8a21b8 100644 +index 58e10381c8..0e8a21b803 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftOfflinePlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftOfflinePlayer.java @@ -29,12 +29,12 @@ import org.bukkit.plugin.Plugin; @@ -61,5 +61,5 @@ index 58e10381..0e8a21b8 100644 @Override -- -2.25.1.windows.1 +2.26.2 diff --git a/Spigot-Server-Patches/0335-Add-PlayerConnectionCloseEvent.patch b/Spigot-Server-Patches/0335-Add-PlayerConnectionCloseEvent.patch index 95fb5abeea..8eee0b9af4 100644 --- a/Spigot-Server-Patches/0335-Add-PlayerConnectionCloseEvent.patch +++ b/Spigot-Server-Patches/0335-Add-PlayerConnectionCloseEvent.patch @@ -1,4 +1,4 @@ -From 79baca93f93133cafd97a71c374109f2a7415828 Mon Sep 17 00:00:00 2001 +From 6472f6dc846a23a7a031dc575368ab1650ba63de 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 47cf1050..f1222fcb 100644 +index 47cf105019..f1222fcb2b 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 47cf1050..f1222fcb 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 d4aad8a5..b1dededc 100644 +index d4aad8a5b7..b1dededc15 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 d4aad8a5..b1dededc 100644 } -- -2.25.1.windows.1 +2.26.2 diff --git a/Spigot-Server-Patches/0336-Prevent-Enderman-from-loading-chunks.patch b/Spigot-Server-Patches/0336-Prevent-Enderman-from-loading-chunks.patch index 247318ec3f..7a83189657 100644 --- a/Spigot-Server-Patches/0336-Prevent-Enderman-from-loading-chunks.patch +++ b/Spigot-Server-Patches/0336-Prevent-Enderman-from-loading-chunks.patch @@ -1,11 +1,11 @@ -From 21183b34c10a9a2ae9a416f2598d81723423fc76 Mon Sep 17 00:00:00 2001 +From 29df97db28b6c69cc3b420c570d65628498e4f19 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 d86f76f3..212636dc 100644 +index d86f76f30b..212636dcb2 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 d86f76f3..212636dc 100644 IBlockData iblockdata1 = world.getType(blockposition1); IBlockData iblockdata2 = Block.getValidBlockForPosition(getEnderman().getCarried(), getEnderman().world, blockposition); // Paper - Fix MC-124320 -- -2.25.1.windows.1 +2.26.2 diff --git a/Spigot-Server-Patches/0337-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch b/Spigot-Server-Patches/0337-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch index 729de91a8d..50decf25fd 100644 --- a/Spigot-Server-Patches/0337-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch +++ b/Spigot-Server-Patches/0337-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch @@ -1,4 +1,4 @@ -From cfb0c229b20c89a4c8deff7ea4d2d2b6e44e0d9a Mon Sep 17 00:00:00 2001 +From 1ff7ab3d1f80417607329ccfb45a20d98dffe303 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 ad40c254..fd7d2fb1 100644 +index 960e1fd4ad..c5b8e76e2c 100644 --- a/src/main/java/net/minecraft/server/EntityPlayer.java +++ b/src/main/java/net/minecraft/server/EntityPlayer.java @@ -76,6 +76,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting { @@ -28,7 +28,7 @@ index ad40c254..fd7d2fb1 100644 public boolean queueHealthUpdatePacket = false; public net.minecraft.server.PacketPlayOutUpdateHealth queuedHealthUpdatePacket; diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java -index 6b672018..e148940a 100644 +index 6b67201852..e148940ab3 100644 --- a/src/main/java/net/minecraft/server/PlayerList.java +++ b/src/main/java/net/minecraft/server/PlayerList.java @@ -94,6 +94,7 @@ public abstract class PlayerList { @@ -40,7 +40,7 @@ index 6b672018..e148940a 100644 UserCache usercache = this.server.getUserCache(); GameProfile gameprofile1 = usercache.getProfile(gameprofile.getId()); diff --git a/src/main/java/org/bukkit/craftbukkit/CraftOfflinePlayer.java b/src/main/java/org/bukkit/craftbukkit/CraftOfflinePlayer.java -index 0e8a21b8..32e02af9 100644 +index 0e8a21b803..32e02af96e 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftOfflinePlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftOfflinePlayer.java @@ -260,6 +260,61 @@ public class CraftOfflinePlayer implements OfflinePlayer, ConfigurationSerializa @@ -106,7 +106,7 @@ index 0e8a21b8..32e02af9 100644 public Location getBedSpawnLocation() { NBTTagCompound data = getData(); diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index 823dba01..21aaacc1 100644 +index a8f46ceb4b..8cf17e5ebf 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -139,6 +139,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player { @@ -163,5 +163,5 @@ index 823dba01..21aaacc1 100644 @Override -- -2.25.1.windows.1 +2.26.2 diff --git a/Spigot-Server-Patches/0338-Fix-PlayerEditBookEvent.patch b/Spigot-Server-Patches/0338-Fix-PlayerEditBookEvent.patch index 05965318dc..4174d4e51a 100644 --- a/Spigot-Server-Patches/0338-Fix-PlayerEditBookEvent.patch +++ b/Spigot-Server-Patches/0338-Fix-PlayerEditBookEvent.patch @@ -1,4 +1,4 @@ -From fe6190c533e4206ff46b0e9c3e7570f74cc31a64 Mon Sep 17 00:00:00 2001 +From 9549441487fa359a7a6b323ab0aa73b8e7a62ce5 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 784f0a3f..4b3ddfd9 100644 +index 784f0a3f22..4b3ddfd990 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 784f0a3f..4b3ddfd9 100644 } -- -2.25.1.windows.1 +2.26.2 diff --git a/Spigot-Server-Patches/0339-Workaround-for-vehicle-tracking-issue-on-disconnect.patch b/Spigot-Server-Patches/0339-Workaround-for-vehicle-tracking-issue-on-disconnect.patch index ab21c920fa..7e24578054 100644 --- a/Spigot-Server-Patches/0339-Workaround-for-vehicle-tracking-issue-on-disconnect.patch +++ b/Spigot-Server-Patches/0339-Workaround-for-vehicle-tracking-issue-on-disconnect.patch @@ -1,4 +1,4 @@ -From ef6c8f1c4076d33dbbef736e15a7dc1b5224176e Mon Sep 17 00:00:00 2001 +From c48eb30d4a45796d7d5a8f040bd3c018ba2cb440 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/Spigot-Server-Patches/0340-Fire-BlockPistonRetractEvent-for-all-empty-pistons.patch b/Spigot-Server-Patches/0340-Fire-BlockPistonRetractEvent-for-all-empty-pistons.patch index 2597979f58..e6270f1076 100644 --- a/Spigot-Server-Patches/0340-Fire-BlockPistonRetractEvent-for-all-empty-pistons.patch +++ b/Spigot-Server-Patches/0340-Fire-BlockPistonRetractEvent-for-all-empty-pistons.patch @@ -1,4 +1,4 @@ -From e4d61360072c669cca7b0e0bc26be0bfaff1504a Mon Sep 17 00:00:00 2001 +From 41e89ff3c9dd39aafaca483697bd618bb0b5bfbb 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 1170a281..b29525c4 100644 +index 1170a28107..b29525c40d 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 1170a281..b29525c4 100644 // CraftBukkit end world.playBlockAction(blockposition, this, b0, enumdirection.b()); -- -2.25.1.windows.1 +2.26.2 diff --git a/Spigot-Server-Patches/0341-Block-Entity-remove-from-being-called-on-Players.patch b/Spigot-Server-Patches/0341-Block-Entity-remove-from-being-called-on-Players.patch index 97a9b8ad79..e1d3ab0895 100644 --- a/Spigot-Server-Patches/0341-Block-Entity-remove-from-being-called-on-Players.patch +++ b/Spigot-Server-Patches/0341-Block-Entity-remove-from-being-called-on-Players.patch @@ -1,4 +1,4 @@ -From a1a450ce5d84a5aaed071bfaea4439d3c83560f9 Mon Sep 17 00:00:00 2001 +From 046ac7ebeb6bcc1d66f449eb5884180875f7874c 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 @@ -12,7 +12,7 @@ Player we will look at limiting the scope of this change. It appears to be unintentional in the few cases we've seen so far. diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index 21aaacc1..344e9e9b 100644 +index 8cf17e5ebf..6e3bcfe2cd 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -1950,6 +1950,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player { @@ -32,5 +32,5 @@ index 21aaacc1..344e9e9b 100644 // Spigot start -- -2.25.1.windows.1 +2.26.2 diff --git a/Spigot-Server-Patches/0342-BlockDestroyEvent.patch b/Spigot-Server-Patches/0342-BlockDestroyEvent.patch index 43b6ae1514..5961ea5e6d 100644 --- a/Spigot-Server-Patches/0342-BlockDestroyEvent.patch +++ b/Spigot-Server-Patches/0342-BlockDestroyEvent.patch @@ -1,4 +1,4 @@ -From 290a78bfde385d87da94fac86f66f7a64767d282 Mon Sep 17 00:00:00 2001 +From f884455c12a245c1c9d3e8d77fd1d1f855c67d2b 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 f8619578..a3fbdf5d 100644 +index f861957842..a3fbdf5db5 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -452,8 +452,20 @@ public abstract class World implements GeneratorAccess, AutoCloseable { @@ -37,5 +37,5 @@ index f8619578..a3fbdf5d 100644 TileEntity tileentity = iblockdata.getBlock().isTileEntity() ? this.getTileEntity(blockposition) : null; -- -2.25.1.windows.1 +2.26.2 diff --git a/Spigot-Server-Patches/0343-Fix-Custom-Shapeless-Custom-Crafting-Recipes.patch b/Spigot-Server-Patches/0343-Fix-Custom-Shapeless-Custom-Crafting-Recipes.patch index 472af452a0..d880db798f 100644 --- a/Spigot-Server-Patches/0343-Fix-Custom-Shapeless-Custom-Crafting-Recipes.patch +++ b/Spigot-Server-Patches/0343-Fix-Custom-Shapeless-Custom-Crafting-Recipes.patch @@ -1,4 +1,4 @@ -From e68eac847ee9351dbee70bda0c537f7cfcf0e028 Mon Sep 17 00:00:00 2001 +From 50e5846d42abd8ca6c3cf79a6f66d6cca7195c04 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 fe03a35c..fb481e65 100644 +index fe03a35cc8..fb481e6586 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 fe03a35c..fb481e65 100644 public ItemStack a(InventoryCrafting inventorycrafting) { -- -2.25.1.windows.1 +2.26.2 diff --git a/Spigot-Server-Patches/0344-Fix-sign-edit-memory-leak.patch b/Spigot-Server-Patches/0344-Fix-sign-edit-memory-leak.patch index 381a9535bb..2c9a612249 100644 --- a/Spigot-Server-Patches/0344-Fix-sign-edit-memory-leak.patch +++ b/Spigot-Server-Patches/0344-Fix-sign-edit-memory-leak.patch @@ -1,4 +1,4 @@ -From a69f4c530e32e263ca5bd30b9327f0e3c1754b45 Mon Sep 17 00:00:00 2001 +From f0ae31c519bfef05b81bac120398101448cbe471 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 4b3ddfd9..2c94ca6a 100644 +index 4b3ddfd990..2c94ca6a8e 100644 --- a/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java @@ -2546,7 +2546,7 @@ public class PlayerConnection implements PacketListenerPlayIn { @@ -19,7 +19,7 @@ index 4b3ddfd9..2c94ca6a 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 03f6ddf0..a9340201 100644 +index 03f6ddf000..a934020190 100644 --- a/src/main/java/net/minecraft/server/TileEntitySign.java +++ b/src/main/java/net/minecraft/server/TileEntitySign.java @@ -10,6 +10,7 @@ public class TileEntitySign extends TileEntity implements ICommandListener { // @@ -43,5 +43,5 @@ index 03f6ddf0..a9340201 100644 public EntityHuman f() { -- -2.25.1.windows.1 +2.26.2 diff --git a/Spigot-Server-Patches/0345-Limit-Client-Sign-length-more.patch b/Spigot-Server-Patches/0345-Limit-Client-Sign-length-more.patch index 9f97cbe6f6..c98c94455a 100644 --- a/Spigot-Server-Patches/0345-Limit-Client-Sign-length-more.patch +++ b/Spigot-Server-Patches/0345-Limit-Client-Sign-length-more.patch @@ -1,4 +1,4 @@ -From 4b71c78bbf78a41d0445285a759d8291e89a1d48 Mon Sep 17 00:00:00 2001 +From 75d42ab5d15870574bbb5553e685acc9fdb5738e 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 2c94ca6a..94d3d602 100644 +index 2c94ca6a8e..94d3d602cc 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 2c94ca6a..94d3d602 100644 } SignChangeEvent event = new SignChangeEvent((org.bukkit.craftbukkit.block.CraftBlock) player.getWorld().getBlockAt(x, y, z), this.server.getPlayer(this.player), lines); -- -2.25.1.windows.1 +2.26.2 diff --git a/Spigot-Server-Patches/0346-Don-t-check-ConvertSigns-boolean-every-sign-save.patch b/Spigot-Server-Patches/0346-Don-t-check-ConvertSigns-boolean-every-sign-save.patch index 9a4e2ead64..1567f45062 100644 --- a/Spigot-Server-Patches/0346-Don-t-check-ConvertSigns-boolean-every-sign-save.patch +++ b/Spigot-Server-Patches/0346-Don-t-check-ConvertSigns-boolean-every-sign-save.patch @@ -1,4 +1,4 @@ -From e9fb4fbbaa2762920a65a926f082e2db3d95b8a5 Mon Sep 17 00:00:00 2001 +From bc69287d6ccb8be530da8e61c5988dfb41083292 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 a9340201..0e9a90b7 100644 +index a934020190..0e9a90b70f 100644 --- a/src/main/java/net/minecraft/server/TileEntitySign.java +++ b/src/main/java/net/minecraft/server/TileEntitySign.java @@ -11,6 +11,7 @@ public class TileEntitySign extends TileEntity implements ICommandListener { // @@ -28,5 +28,5 @@ index a9340201..0e9a90b7 100644 } // CraftBukkit end -- -2.25.1.windows.1 +2.26.2 diff --git a/Spigot-Server-Patches/0347-Handle-Excessive-Signs-in-Chunks-creating-too-large-.patch b/Spigot-Server-Patches/0347-Handle-Excessive-Signs-in-Chunks-creating-too-large-.patch index ee9fe5a6bc..73c11093b5 100644 --- a/Spigot-Server-Patches/0347-Handle-Excessive-Signs-in-Chunks-creating-too-large-.patch +++ b/Spigot-Server-Patches/0347-Handle-Excessive-Signs-in-Chunks-creating-too-large-.patch @@ -1,4 +1,4 @@ -From 79ade9ae1bc8cd18f26cb92d1e3bafb3a2541844 Mon Sep 17 00:00:00 2001 +From e2da9703f8381ba7de85b37e7c7834e9b90787ed 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 b1dededc..e156804f 100644 +index b1dededc15..e156804f7a 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 b1dededc..e156804f 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 2d8e6a2f..8d0965a0 100644 +index 2d8e6a2f4a..8d0965a053 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 2d8e6a2f..8d0965a0 100644 return false; } diff --git a/src/main/java/net/minecraft/server/PacketPlayOutMapChunk.java b/src/main/java/net/minecraft/server/PacketPlayOutMapChunk.java -index a0b87f89..47710067 100644 +index a0b87f89df..47710067a6 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 a0b87f89..47710067 100644 if (tileentity instanceof TileEntitySkull) { TileEntitySkull.sanitizeTileEntityUUID(nbttagcompound); } // Paper -- -2.25.1.windows.1 +2.26.2 diff --git a/Spigot-Server-Patches/0348-MC-145260-Fix-Whitelist-On-Off-inconsistency.patch b/Spigot-Server-Patches/0348-MC-145260-Fix-Whitelist-On-Off-inconsistency.patch index 8716c1b008..949b0cc957 100644 --- a/Spigot-Server-Patches/0348-MC-145260-Fix-Whitelist-On-Off-inconsistency.patch +++ b/Spigot-Server-Patches/0348-MC-145260-Fix-Whitelist-On-Off-inconsistency.patch @@ -1,4 +1,4 @@ -From 0a473ae60a871cfc7ba74a90fe048bce11eadcb9 Mon Sep 17 00:00:00 2001 +From fba67f3ef49b5657b06b515fa949537fb350e6d5 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 8570e38f..c97be42d 100644 +index 8570e38f42..c97be42dd7 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 8570e38f..c97be42d 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 e148940a..f71c9f4a 100644 +index e148940ab3..f71c9f4a88 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 e148940a..f71c9f4a 100644 public List b(String s) { -- -2.25.1.windows.1 +2.26.2 diff --git a/Spigot-Server-Patches/0349-Set-Zombie-last-tick-at-start-of-drowning-process.patch b/Spigot-Server-Patches/0349-Set-Zombie-last-tick-at-start-of-drowning-process.patch index 74cdf4e946..9053f00481 100644 --- a/Spigot-Server-Patches/0349-Set-Zombie-last-tick-at-start-of-drowning-process.patch +++ b/Spigot-Server-Patches/0349-Set-Zombie-last-tick-at-start-of-drowning-process.patch @@ -1,4 +1,4 @@ -From 401d79b1752af4a7ca46293379f65d0b4456fb20 Mon Sep 17 00:00:00 2001 +From 927f97dad5c3c7c78203de3e3fd891a8d85652eb 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 2d4f8aac..8635d4f4 100644 +index 2d4f8aac8f..8635d4f40c 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 2d4f8aac..8635d4f4 100644 } else { this.bC = -1; -- -2.25.1.windows.1 +2.26.2 diff --git a/Spigot-Server-Patches/0350-Allow-Saving-of-Oversized-Chunks.patch b/Spigot-Server-Patches/0350-Allow-Saving-of-Oversized-Chunks.patch index 00f0a40fb9..4de197181f 100644 --- a/Spigot-Server-Patches/0350-Allow-Saving-of-Oversized-Chunks.patch +++ b/Spigot-Server-Patches/0350-Allow-Saving-of-Oversized-Chunks.patch @@ -1,4 +1,4 @@ -From 3730b342fbaa3df1d482b4adbb34612ea9c8b84d Mon Sep 17 00:00:00 2001 +From 3d59a86908c816eb90269b64d8b8d8b6d7829673 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 diff --git a/Spigot-Server-Patches/0351-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch b/Spigot-Server-Patches/0351-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch index a0657393e9..550ccd13dc 100644 --- a/Spigot-Server-Patches/0351-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch +++ b/Spigot-Server-Patches/0351-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch @@ -1,11 +1,11 @@ -From 085048c4c7fba75dd004f62b842230c5e2ce45bd Mon Sep 17 00:00:00 2001 +From 2309159b775070446967c0c5904e5a5aed637fdf 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 f71c9f4a..e9908cd0 100644 +index f71c9f4a88..e9908cd01f 100644 --- a/src/main/java/net/minecraft/server/PlayerList.java +++ b/src/main/java/net/minecraft/server/PlayerList.java @@ -1022,6 +1022,7 @@ public abstract class PlayerList { @@ -17,5 +17,5 @@ index f71c9f4a..e9908cd0 100644 } -- -2.25.1.windows.1 +2.26.2 diff --git a/Spigot-Server-Patches/0352-Add-LivingEntity-getTargetEntity.patch b/Spigot-Server-Patches/0352-Add-LivingEntity-getTargetEntity.patch index 383125f1eb..5fa0fb791c 100644 --- a/Spigot-Server-Patches/0352-Add-LivingEntity-getTargetEntity.patch +++ b/Spigot-Server-Patches/0352-Add-LivingEntity-getTargetEntity.patch @@ -1,4 +1,4 @@ -From c12ef7fd696c115efff8c55b0ec24468888b0397 Mon Sep 17 00:00:00 2001 +From 20e594e2be54a1376bc40e754be8898060789567 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/Spigot-Server-Patches/0353-Use-proper-max-length-when-serialising-BungeeCord-te.patch b/Spigot-Server-Patches/0353-Use-proper-max-length-when-serialising-BungeeCord-te.patch index 129bb4949c..c44b7daff9 100644 --- a/Spigot-Server-Patches/0353-Use-proper-max-length-when-serialising-BungeeCord-te.patch +++ b/Spigot-Server-Patches/0353-Use-proper-max-length-when-serialising-BungeeCord-te.patch @@ -1,4 +1,4 @@ -From c8a5c264dd04d38563325b637bd7daeb16d89221 Mon Sep 17 00:00:00 2001 +From 04fbaf647e0fe31e89d8ddea1e2da1f746a35035 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 0ab61156..f7b2095b 100644 +index 0ab611564e..f7b2095bb7 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 0ab61156..f7b2095b 100644 // Paper end } else { -- -2.25.1.windows.1 +2.26.2 diff --git a/Spigot-Server-Patches/0354-Entity-getEntitySpawnReason.patch b/Spigot-Server-Patches/0354-Entity-getEntitySpawnReason.patch index de6f7f77eb..3c31d664b9 100644 --- a/Spigot-Server-Patches/0354-Entity-getEntitySpawnReason.patch +++ b/Spigot-Server-Patches/0354-Entity-getEntitySpawnReason.patch @@ -1,4 +1,4 @@ -From d207248747c89cbe150491fac917ac4bf2f3fd4e Mon Sep 17 00:00:00 2001 +From 2b99d6a27557385cf4700c9c1b906fa284f86250 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sun, 24 Mar 2019 00:24:52 -0400 Subject: [PATCH] Entity#getEntitySpawnReason diff --git a/Spigot-Server-Patches/0355-Update-entity-Metadata-for-all-tracked-players.patch b/Spigot-Server-Patches/0355-Update-entity-Metadata-for-all-tracked-players.patch index da6c8c1bf3..ebfeefb43b 100644 --- a/Spigot-Server-Patches/0355-Update-entity-Metadata-for-all-tracked-players.patch +++ b/Spigot-Server-Patches/0355-Update-entity-Metadata-for-all-tracked-players.patch @@ -1,4 +1,4 @@ -From dd6dba897fb9a1838363f2bd89da221a9f6ae91b Mon Sep 17 00:00:00 2001 +From 53f2486cd178c8aeafe4f7fcbcc38b91401cdb88 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/Spigot-Server-Patches/0356-Fire-event-on-GS4-query.patch b/Spigot-Server-Patches/0356-Fire-event-on-GS4-query.patch index 50d0403b33..90149b6d04 100644 --- a/Spigot-Server-Patches/0356-Fire-event-on-GS4-query.patch +++ b/Spigot-Server-Patches/0356-Fire-event-on-GS4-query.patch @@ -1,11 +1,11 @@ -From 661b2ce09e95f94fa0fffa59708e5d2b28c61b9c Mon Sep 17 00:00:00 2001 +From 6368f83b3c11cd5930a058d7e1af219689de710a 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 66bfbcf0..d821ef9a 100644 +index 66bfbcf02b..d821ef9a75 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 66bfbcf0..d821ef9a 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 f4f4e31d..d5025938 100644 +index f4f4e31d3c..d502593847 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 f4f4e31d..d5025938 100644 } } diff --git a/src/main/java/net/minecraft/server/RemoteStatusReply.java b/src/main/java/net/minecraft/server/RemoteStatusReply.java -index 848b5c3f..73efea7e 100644 +index 848b5c3f0e..73efea7e13 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 848b5c3f..73efea7e 100644 this.b.writeShort(Short.reverseBytes(short0)); } -- -2.25.1.windows.1 +2.26.2 diff --git a/Spigot-Server-Patches/0357-Implement-PlayerPostRespawnEvent.patch b/Spigot-Server-Patches/0357-Implement-PlayerPostRespawnEvent.patch index 850c6a64fc..73ff2bf8bb 100644 --- a/Spigot-Server-Patches/0357-Implement-PlayerPostRespawnEvent.patch +++ b/Spigot-Server-Patches/0357-Implement-PlayerPostRespawnEvent.patch @@ -1,11 +1,11 @@ -From 38f581e7c99c67fc727ae99afdcf741ddbeeba8d Mon Sep 17 00:00:00 2001 +From fe1d9061214fcaaea43cc380bd8819db43cd6ef5 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 7745e70d..765ebe2c 100644 +index 7745e70d2d..765ebe2ccf 100644 --- a/src/main/java/net/minecraft/server/PlayerList.java +++ b/src/main/java/net/minecraft/server/PlayerList.java @@ -625,9 +625,14 @@ public abstract class PlayerList { @@ -47,5 +47,5 @@ index 7745e70d..765ebe2c 100644 return entityplayer1; } -- -2.25.1.windows.1 +2.26.2 diff --git a/Spigot-Server-Patches/0358-don-t-go-below-0-for-pickupDelay-breaks-picking-up-i.patch b/Spigot-Server-Patches/0358-don-t-go-below-0-for-pickupDelay-breaks-picking-up-i.patch index 499d5444bf..8f418585c3 100644 --- a/Spigot-Server-Patches/0358-don-t-go-below-0-for-pickupDelay-breaks-picking-up-i.patch +++ b/Spigot-Server-Patches/0358-don-t-go-below-0-for-pickupDelay-breaks-picking-up-i.patch @@ -1,4 +1,4 @@ -From 9a41b21eb77033d74bc2b5150ac987fa4a3fec3d Mon Sep 17 00:00:00 2001 +From 0c5dafb96edefcc69c58ac616a6cdfa53a9d424a 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 e5c9bac8..ef2cf656 100644 +index e5c9bac88a..ef2cf6565b 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 e5c9bac8..ef2cf656 100644 this.lastTick = MinecraftServer.currentTick; // CraftBukkit end -- -2.25.1.windows.1 +2.26.2 diff --git a/Spigot-Server-Patches/0359-Implement-getters-and-setters-for-EntityItem-owner-a.patch b/Spigot-Server-Patches/0359-Implement-getters-and-setters-for-EntityItem-owner-a.patch index fc8dbd56a3..a00738c088 100644 --- a/Spigot-Server-Patches/0359-Implement-getters-and-setters-for-EntityItem-owner-a.patch +++ b/Spigot-Server-Patches/0359-Implement-getters-and-setters-for-EntityItem-owner-a.patch @@ -1,4 +1,4 @@ -From 604551926888206fa0b23fd3f0d8f21ae4bba7bd Mon Sep 17 00:00:00 2001 +From f2e944bdd3e61bff0b406b41f6e9479773f303f7 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 3f552b59..cb756b1b 100644 +index 3f552b5905..cb756b1ba0 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 3f552b59..cb756b1b 100644 @Override -- -2.25.1.windows.1 +2.26.2 diff --git a/Spigot-Server-Patches/0360-Server-Tick-Events.patch b/Spigot-Server-Patches/0360-Server-Tick-Events.patch index aca35e6e49..01a59082f0 100644 --- a/Spigot-Server-Patches/0360-Server-Tick-Events.patch +++ b/Spigot-Server-Patches/0360-Server-Tick-Events.patch @@ -1,4 +1,4 @@ -From 9346fa320e8ab02cfb8a9d94c5bdccc6dcc8e964 Mon Sep 17 00:00:00 2001 +From 920bc1ee45449dd207915a96b375578c12ff65df Mon Sep 17 00:00:00 2001 From: Aikar Date: Wed, 27 Mar 2019 22:48:45 -0400 Subject: [PATCH] Server Tick Events diff --git a/Spigot-Server-Patches/0361-PlayerDeathEvent-getItemsToKeep.patch b/Spigot-Server-Patches/0361-PlayerDeathEvent-getItemsToKeep.patch index 74d82c15e8..72e38d831e 100644 --- a/Spigot-Server-Patches/0361-PlayerDeathEvent-getItemsToKeep.patch +++ b/Spigot-Server-Patches/0361-PlayerDeathEvent-getItemsToKeep.patch @@ -1,4 +1,4 @@ -From 9ed408500b8b1ed52a10f61596a563b2cfbc11a5 Mon Sep 17 00:00:00 2001 +From 503288334c8c014ccf596d10eda2ae7d79af30db Mon Sep 17 00:00:00 2001 From: Aikar 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 cd981e0a..82a80e34 100644 +index 17c9c90359..f375c9507c 100644 --- a/src/main/java/net/minecraft/server/EntityPlayer.java +++ b/src/main/java/net/minecraft/server/EntityPlayer.java @@ -516,6 +516,46 @@ public class EntityPlayer extends EntityHuman implements ICrafting { @@ -73,5 +73,5 @@ index cd981e0a..82a80e34 100644 this.setSpectatorTarget(this); // Remove spectated target -- -2.25.1.windows.1 +2.26.2 diff --git a/Spigot-Server-Patches/0362-Optimize-Captured-TileEntity-Lookup.patch b/Spigot-Server-Patches/0362-Optimize-Captured-TileEntity-Lookup.patch index 8c07d4e53e..5b4406e35e 100644 --- a/Spigot-Server-Patches/0362-Optimize-Captured-TileEntity-Lookup.patch +++ b/Spigot-Server-Patches/0362-Optimize-Captured-TileEntity-Lookup.patch @@ -1,4 +1,4 @@ -From 146abc015bbb13fcf164daee7a480c858c210ff7 Mon Sep 17 00:00:00 2001 +From 23c0ef61239b0c992bdd637d092e08161c8376a1 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 a3fbdf5d..f797d737 100644 +index a3fbdf5db5..f797d737a3 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -998,12 +998,13 @@ public abstract class World implements GeneratorAccess, AutoCloseable { @@ -31,5 +31,5 @@ index a3fbdf5d..f797d737 100644 if (this.tickingTileEntities) { tileentity = this.e(blockposition); -- -2.25.1.windows.1 +2.26.2 diff --git a/Spigot-Server-Patches/0363-Add-Heightmap-API.patch b/Spigot-Server-Patches/0363-Add-Heightmap-API.patch index 6e50b801b1..844e77118e 100644 --- a/Spigot-Server-Patches/0363-Add-Heightmap-API.patch +++ b/Spigot-Server-Patches/0363-Add-Heightmap-API.patch @@ -1,11 +1,11 @@ -From b8b5ea0419fd601e91208f44afdbda79e21e679f Mon Sep 17 00:00:00 2001 +From 6bf15982de8340f724270d5927326022f541c9bf 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 f797d737..983bc1c7 100644 +index f797d737a3..983bc1c7d9 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -573,8 +573,8 @@ public abstract class World implements GeneratorAccess, AutoCloseable { @@ -20,7 +20,7 @@ index f797d737..983bc1c7 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 06b2e8b9..693dc983 100644 +index db31b17b87..0d5731429a 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java @@ -339,6 +339,29 @@ public class CraftWorld implements World { @@ -54,5 +54,5 @@ index 06b2e8b9..693dc983 100644 public Location getSpawnLocation() { BlockPosition spawn = world.getSpawn(); -- -2.25.1.windows.1 +2.26.2 diff --git a/Spigot-Server-Patches/0364-Mob-Spawner-API-Enhancements.patch b/Spigot-Server-Patches/0364-Mob-Spawner-API-Enhancements.patch index 70832c23f1..4e10ed2137 100644 --- a/Spigot-Server-Patches/0364-Mob-Spawner-API-Enhancements.patch +++ b/Spigot-Server-Patches/0364-Mob-Spawner-API-Enhancements.patch @@ -1,11 +1,11 @@ -From 4f3ca22407e9288985fb6bfec250f8694f64679c Mon Sep 17 00:00:00 2001 +From d46e20a175c7deee53044d4e966d5df554c526c1 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 cb7cb789..41001b02 100644 +index cb7cb789b8..41001b02a6 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 cb7cb789..41001b02 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 5c4c3c70..e78e3804 100644 +index 5c4c3c70c7..e78e3804ba 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 @@ -7,7 +7,7 @@ I hope to look at this more in-depth soon. It appears doable. However this should not block the update. diff --git a/src/main/java/net/minecraft/server/EntityEnderDragon.java b/src/main/java/net/minecraft/server/EntityEnderDragon.java -index 6a4ccaeb..af10fc36 100644 +index 6a4ccaeb0f..af10fc36e0 100644 --- a/src/main/java/net/minecraft/server/EntityEnderDragon.java +++ b/src/main/java/net/minecraft/server/EntityEnderDragon.java @@ -579,9 +579,9 @@ public class EntityEnderDragon extends EntityInsentient implements IMonster { @@ -23,7 +23,7 @@ index 6a4ccaeb..af10fc36 100644 double deltaX = this.locX() - player.locX(); double deltaZ = this.locZ() - player.locZ(); diff --git a/src/main/java/net/minecraft/server/EntityWither.java b/src/main/java/net/minecraft/server/EntityWither.java -index 2e95069c..8977c351 100644 +index 2e95069c19..8977c3516b 100644 --- a/src/main/java/net/minecraft/server/EntityWither.java +++ b/src/main/java/net/minecraft/server/EntityWither.java @@ -208,9 +208,9 @@ public class EntityWither extends EntityMonster implements IRangedEntity { @@ -39,7 +39,7 @@ index 2e95069c..8977c351 100644 double deltaX = this.locX() - player.locX(); double deltaZ = this.locZ() - player.locZ(); diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index 344e9e9b..33cac5fc 100644 +index 6e3bcfe2cd..e76f2b9c7f 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -1959,6 +1959,16 @@ public class CraftPlayer extends CraftHumanEntity implements Player { @@ -60,5 +60,5 @@ index 344e9e9b..33cac5fc 100644 // Spigot start -- -2.25.1.windows.1 +2.26.2 diff --git a/Spigot-Server-Patches/0366-Fix-CB-call-to-changed-postToMainThread-method.patch b/Spigot-Server-Patches/0366-Fix-CB-call-to-changed-postToMainThread-method.patch index 7f23e13d98..fa80476b96 100644 --- a/Spigot-Server-Patches/0366-Fix-CB-call-to-changed-postToMainThread-method.patch +++ b/Spigot-Server-Patches/0366-Fix-CB-call-to-changed-postToMainThread-method.patch @@ -1,11 +1,11 @@ -From d9f46969684c3996ce3683e374288454e9af07f0 Mon Sep 17 00:00:00 2001 +From 2cf64c24dc08b86ebede63940f7c60e939293fd3 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 eee96c3a..69133121 100644 +index f496006f3c..65c171cec3 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 eee96c3a..69133121 100644 @Override -- -2.25.1.windows.1 +2.26.2 diff --git a/Spigot-Server-Patches/0367-Fix-sounds-when-item-frames-are-modified-MC-123450.patch b/Spigot-Server-Patches/0367-Fix-sounds-when-item-frames-are-modified-MC-123450.patch index 9b85ce5054..43a72d0b80 100644 --- a/Spigot-Server-Patches/0367-Fix-sounds-when-item-frames-are-modified-MC-123450.patch +++ b/Spigot-Server-Patches/0367-Fix-sounds-when-item-frames-are-modified-MC-123450.patch @@ -1,4 +1,4 @@ -From dc9a7fdfadcee5c6eef1a8d4c907f9072117cdbf Mon Sep 17 00:00:00 2001 +From 6d6002de9471b8642c27bbb0117d32aad673952f 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) diff --git a/Spigot-Server-Patches/0368-Fix-CraftServer-isPrimaryThread-and-MinecraftServer-.patch b/Spigot-Server-Patches/0368-Fix-CraftServer-isPrimaryThread-and-MinecraftServer-.patch index d3ff57c7c4..82c5eb2a1d 100644 --- a/Spigot-Server-Patches/0368-Fix-CraftServer-isPrimaryThread-and-MinecraftServer-.patch +++ b/Spigot-Server-Patches/0368-Fix-CraftServer-isPrimaryThread-and-MinecraftServer-.patch @@ -1,4 +1,4 @@ -From 9a321e2b4d5428280329c33fa8c47479a3783216 Mon Sep 17 00:00:00 2001 +From 8af095a4141ffaceab91fafb82e0d51a82533b58 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 diff --git a/Spigot-Server-Patches/0369-Fix-issues-with-entity-loss-due-to-unloaded-chunks.patch b/Spigot-Server-Patches/0369-Fix-issues-with-entity-loss-due-to-unloaded-chunks.patch index 7b259442c4..28ad196697 100644 --- a/Spigot-Server-Patches/0369-Fix-issues-with-entity-loss-due-to-unloaded-chunks.patch +++ b/Spigot-Server-Patches/0369-Fix-issues-with-entity-loss-due-to-unloaded-chunks.patch @@ -1,4 +1,4 @@ -From abb9b457b22548308cfdab21f0e4470b3e519f33 Mon Sep 17 00:00:00 2001 +From b8287f99f5ee5e93683367ffa43fdd4fe1e48f1f Mon Sep 17 00:00:00 2001 From: Aikar Date: Fri, 28 Sep 2018 21:49:53 -0400 Subject: [PATCH] Fix issues with entity loss due to unloaded chunks @@ -19,7 +19,7 @@ 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 f7a1fad9..e34ea3d0 100644 +index f7a1fad9c1..e34ea3d098 100644 --- a/src/main/java/net/minecraft/server/WorldServer.java +++ b/src/main/java/net/minecraft/server/WorldServer.java @@ -707,7 +707,7 @@ public class WorldServer extends World { @@ -41,5 +41,5 @@ index f7a1fad9..e34ea3d0 100644 if (!(ichunkaccess instanceof Chunk)) { return false; -- -2.25.1.windows.1 +2.26.2 diff --git a/Spigot-Server-Patches/0370-Duplicate-UUID-Resolve-Option.patch b/Spigot-Server-Patches/0370-Duplicate-UUID-Resolve-Option.patch index 48dbfa32a7..a578fd2994 100644 --- a/Spigot-Server-Patches/0370-Duplicate-UUID-Resolve-Option.patch +++ b/Spigot-Server-Patches/0370-Duplicate-UUID-Resolve-Option.patch @@ -1,4 +1,4 @@ -From 302c8671438fd163891620f24b30992b5b10c81f Mon Sep 17 00:00:00 2001 +From abb8e6809baf86c7be7154fe356b11a663413686 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sat, 21 Jul 2018 14:27:34 -0400 Subject: [PATCH] Duplicate UUID Resolve Option diff --git a/Spigot-Server-Patches/0371-improve-CraftWorld-isChunkLoaded.patch b/Spigot-Server-Patches/0371-improve-CraftWorld-isChunkLoaded.patch index df8ac27580..f58a3b76c2 100644 --- a/Spigot-Server-Patches/0371-improve-CraftWorld-isChunkLoaded.patch +++ b/Spigot-Server-Patches/0371-improve-CraftWorld-isChunkLoaded.patch @@ -1,4 +1,4 @@ -From 32c4bb0dc1ef1627532a2e9cadf9d68211c8eef0 Mon Sep 17 00:00:00 2001 +From 9a1f286e2ac42d5cf63e7e26f8d676f23d140cff 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 29780ee2e0..7033568871 100644 +index 0d5731429a..5ea7b0b25a 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java @@ -405,14 +405,13 @@ public class CraftWorld implements World { diff --git a/Spigot-Server-Patches/0372-Configurable-Keep-Spawn-Loaded-range-per-world.patch b/Spigot-Server-Patches/0372-Configurable-Keep-Spawn-Loaded-range-per-world.patch index f4e17b8d30..e3698dfe3b 100644 --- a/Spigot-Server-Patches/0372-Configurable-Keep-Spawn-Loaded-range-per-world.patch +++ b/Spigot-Server-Patches/0372-Configurable-Keep-Spawn-Loaded-range-per-world.patch @@ -1,4 +1,4 @@ -From 70a7d24cdf80de7aad674e23d5bfd407c04e2d03 Mon Sep 17 00:00:00 2001 +From f71662abfa6f631026e2a31a6fe81da159411d4a 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 @@ -199,10 +199,10 @@ index f9ee9afe3a..389c9d03a1 100644 public LongSet getForceLoadedChunks() { diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -index 7033568871..12ba7d1817 100644 +index 5ea7b0b25a..8f8c18c5a4 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -@@ -1934,15 +1934,21 @@ public class CraftWorld implements World { +@@ -1932,15 +1932,21 @@ public class CraftWorld implements World { @Override public void setKeepSpawnInMemory(boolean keepLoaded) { diff --git a/Spigot-Server-Patches/0373-Fix-some-generation-concurrency-issues.patch b/Spigot-Server-Patches/0373-Fix-some-generation-concurrency-issues.patch index 681131baa7..bc4f321c91 100644 --- a/Spigot-Server-Patches/0373-Fix-some-generation-concurrency-issues.patch +++ b/Spigot-Server-Patches/0373-Fix-some-generation-concurrency-issues.patch @@ -1,11 +1,11 @@ -From fc822e35af3dd267d5cd2d2ef11f8d245d35ea01 Mon Sep 17 00:00:00 2001 +From d49bbe17f24c083ab0defcf54a81be3c1c62dd4f Mon Sep 17 00:00:00 2001 From: Shane Freeder 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 983bc1c7..8cf3c102 100644 +index 983bc1c7d9..8cf3c10274 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -86,6 +86,23 @@ public abstract class World implements GeneratorAccess, AutoCloseable { @@ -33,7 +33,7 @@ index 983bc1c7..8cf3c102 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 22e14fe1..e2af6d43 100644 +index 22e14fe1e9..e2af6d43b2 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 22e14fe1..e2af6d43 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 fc4348b6..44be7169 100644 +index fc4348b602..44be7169ff 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; @@ -222,5 +222,5 @@ index fc4348b6..44be7169 100644 } } -- -2.25.1.windows.1 +2.26.2 diff --git a/Spigot-Server-Patches/0374-MC-114618-Fix-EntityAreaEffectCloud-from-going-negat.patch b/Spigot-Server-Patches/0374-MC-114618-Fix-EntityAreaEffectCloud-from-going-negat.patch index 2e7101b292..5f6a3b41ba 100644 --- a/Spigot-Server-Patches/0374-MC-114618-Fix-EntityAreaEffectCloud-from-going-negat.patch +++ b/Spigot-Server-Patches/0374-MC-114618-Fix-EntityAreaEffectCloud-from-going-negat.patch @@ -1,4 +1,4 @@ -From 77d23c7037cd3437e1dfd1fd4de8523709d1477d Mon Sep 17 00:00:00 2001 +From b534976a471b308f55d533a4d9b8a4196af985f1 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 e8f3e55f..44289c23 100644 +index e8f3e55fd3..44289c2301 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 e8f3e55f..44289c23 100644 if (this.world.isClientSide) { ParticleParam particleparam = this.getParticle(); -- -2.25.1.windows.1 +2.26.2 diff --git a/Spigot-Server-Patches/0375-ChunkMapDistance-CME.patch b/Spigot-Server-Patches/0375-ChunkMapDistance-CME.patch index e0ca89aee4..09bb7e1a66 100644 --- a/Spigot-Server-Patches/0375-ChunkMapDistance-CME.patch +++ b/Spigot-Server-Patches/0375-ChunkMapDistance-CME.patch @@ -1,11 +1,11 @@ -From 03ffe41a9f33838c3870ccaa2da222b88edea438 Mon Sep 17 00:00:00 2001 +From 3ddc66c3dead96c8a40ecd6a9e1a6e998d73113d 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 ae661297..0244768f 100644 +index ae66129777..0244768f76 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 ae661297..0244768f 100644 } else { if (!this.l.isEmpty()) { -- -2.25.1.windows.1 +2.26.2 diff --git a/Spigot-Server-Patches/0376-Implement-CraftBlockSoundGroup.patch b/Spigot-Server-Patches/0376-Implement-CraftBlockSoundGroup.patch index baffcc6ff9..fb8dcd9557 100644 --- a/Spigot-Server-Patches/0376-Implement-CraftBlockSoundGroup.patch +++ b/Spigot-Server-Patches/0376-Implement-CraftBlockSoundGroup.patch @@ -1,4 +1,4 @@ -From 2d5eef6875a913baadfec3d0bdbe878534817e53 Mon Sep 17 00:00:00 2001 +From c27bee1089d1793ed4abb4ce78edad4c2b0b35ea Mon Sep 17 00:00:00 2001 From: simpleauthority Date: Tue, 28 May 2019 03:48:51 -0700 Subject: [PATCH] Implement CraftBlockSoundGroup diff --git a/Spigot-Server-Patches/0377-Chunk-debug-command.patch b/Spigot-Server-Patches/0377-Chunk-debug-command.patch index b9e09d82c8..079fdf353c 100644 --- a/Spigot-Server-Patches/0377-Chunk-debug-command.patch +++ b/Spigot-Server-Patches/0377-Chunk-debug-command.patch @@ -1,4 +1,4 @@ -From 3fb7636d7645f03eb8391bfa41ed461005a94fc6 Mon Sep 17 00:00:00 2001 +From fe0e64b5fa6c9cf4e1f5d5b3f69a1afdcac2838f 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 5acad8e4..af810987 100644 +index 5acad8e44f..af81098784 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 5acad8e4..af810987 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 05534126..c7e86488 100644 +index 8c6550433c..e6d08756f7 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 05534126..c7e86488 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 3342278b..2dcecc1b 100644 +index 3342278bcd..2dcecc1bbd 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 3342278b..2dcecc1b 100644 + } } diff --git a/src/main/java/net/minecraft/server/PlayerChunk.java b/src/main/java/net/minecraft/server/PlayerChunk.java -index 6e9f402f..a640cb38 100644 +index 6e9f402fb0..a640cb3845 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 6e9f402f..a640cb38 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 863c47b7..cdab5ab6 100644 +index 3c237b259e..6122d19ccf 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 863c47b7..cdab5ab6 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 77bb6b09..7a839781 100644 +index 77bb6b092a..7a8397815a 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 77bb6b09..7a839781 100644 return this.b; } -- -2.25.1.windows.1 +2.26.2 diff --git a/Spigot-Server-Patches/0378-incremental-chunk-saving.patch b/Spigot-Server-Patches/0378-incremental-chunk-saving.patch index 206f26b3d9..9618cc1a2e 100644 --- a/Spigot-Server-Patches/0378-incremental-chunk-saving.patch +++ b/Spigot-Server-Patches/0378-incremental-chunk-saving.patch @@ -1,4 +1,4 @@ -From 091bb341d99cb858ab390bed371b416a7126b959 Mon Sep 17 00:00:00 2001 +From c339c9dc305959ce1fd7ff3c76aa5ad621103747 Mon Sep 17 00:00:00 2001 From: Shane Freeder Date: Sun, 9 Jun 2019 03:53:22 +0100 Subject: [PATCH] incremental chunk saving @@ -29,7 +29,7 @@ index 071e5e7f72..4867615215 100644 + } } diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java -index 23cc0c360f..d6637f3ddf 100644 +index 7bcdbe713d..4b77934c39 100644 --- a/src/main/java/net/minecraft/server/Chunk.java +++ b/src/main/java/net/minecraft/server/Chunk.java @@ -42,7 +42,7 @@ public class Chunk implements IChunkAccess { @@ -42,7 +42,7 @@ index 23cc0c360f..d6637f3ddf 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 b7a2cd7342..0dd873a5dd 100644 +index e6d08756f7..6713b7667a 100644 --- a/src/main/java/net/minecraft/server/ChunkProviderServer.java +++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java @@ -515,6 +515,15 @@ public class ChunkProviderServer extends IChunkProvider { @@ -175,7 +175,7 @@ index a640cb3845..3d255b1964 100644 public void a(ProtoChunkExtension protochunkextension) { for (int i = 0; i < this.statusFutures.length(); ++i) { diff --git a/src/main/java/net/minecraft/server/PlayerChunkMap.java b/src/main/java/net/minecraft/server/PlayerChunkMap.java -index cdab5ab6be..18c71609c0 100644 +index 6122d19ccf..4682dca9de 100644 --- a/src/main/java/net/minecraft/server/PlayerChunkMap.java +++ b/src/main/java/net/minecraft/server/PlayerChunkMap.java @@ -331,6 +331,64 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d { diff --git a/Spigot-Server-Patches/0379-Catch-exceptions-from-dispenser-entity-spawns.patch b/Spigot-Server-Patches/0379-Catch-exceptions-from-dispenser-entity-spawns.patch index 95b98270de..6aea698002 100644 --- a/Spigot-Server-Patches/0379-Catch-exceptions-from-dispenser-entity-spawns.patch +++ b/Spigot-Server-Patches/0379-Catch-exceptions-from-dispenser-entity-spawns.patch @@ -1,11 +1,11 @@ -From 81e83ca23bd256517829c75517a0c78c9e2f010e Mon Sep 17 00:00:00 2001 +From f403a4b73ac3674658a77dd99754681bc8fe9d9b 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 5a8c4dc6..b6b7e3c6 100644 +index 5a8c4dc6ba..b6b7e3c6c9 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 5a8c4dc6..b6b7e3c6 100644 // CraftBukkit end return itemstack; -- -2.25.1.windows.1 +2.26.2 diff --git a/Spigot-Server-Patches/0380-Fix-World-isChunkGenerated-calls.patch b/Spigot-Server-Patches/0380-Fix-World-isChunkGenerated-calls.patch index 18327c2cb2..9f35c17089 100644 --- a/Spigot-Server-Patches/0380-Fix-World-isChunkGenerated-calls.patch +++ b/Spigot-Server-Patches/0380-Fix-World-isChunkGenerated-calls.patch @@ -1,4 +1,4 @@ -From 441e488890ea93d9f96f921121eb337757a6935c Mon Sep 17 00:00:00 2001 +From df1fb149e4665163023f0f4dc676d443e521e296 Mon Sep 17 00:00:00 2001 From: Spottedleaf Date: Sat, 15 Jun 2019 08:54:33 -0700 Subject: [PATCH] Fix World#isChunkGenerated calls @@ -280,7 +280,7 @@ index 942b7d3239..2f8af42e2a 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 12ba7d1817..4fa16e167c 100644 +index 8f8c18c5a4..50467656df 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java @@ -19,6 +19,7 @@ import java.util.Objects; diff --git a/Spigot-Server-Patches/0381-Show-blockstate-location-if-we-failed-to-read-it.patch b/Spigot-Server-Patches/0381-Show-blockstate-location-if-we-failed-to-read-it.patch index f3e2d23160..97542cff81 100644 --- a/Spigot-Server-Patches/0381-Show-blockstate-location-if-we-failed-to-read-it.patch +++ b/Spigot-Server-Patches/0381-Show-blockstate-location-if-we-failed-to-read-it.patch @@ -1,11 +1,11 @@ -From 9eb59758d579f44e9161e1ff2a814083939732d9 Mon Sep 17 00:00:00 2001 +From 5fb77abe2ba87a60f9554a8b90cfa4195ab9bc60 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 f6401e2c..3e22d558 100644 +index f6401e2cde..3e22d558ea 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 f6401e2c..3e22d558 100644 public final boolean snapshotDisabled; // Paper -- -2.25.1.windows.1 +2.26.2 diff --git a/Spigot-Server-Patches/0382-Log-other-thread-in-DataPaletteBlock-lock-failure.patch b/Spigot-Server-Patches/0382-Log-other-thread-in-DataPaletteBlock-lock-failure.patch index ab2c7e9480..ee8b28ef88 100644 --- a/Spigot-Server-Patches/0382-Log-other-thread-in-DataPaletteBlock-lock-failure.patch +++ b/Spigot-Server-Patches/0382-Log-other-thread-in-DataPaletteBlock-lock-failure.patch @@ -1,4 +1,4 @@ -From b2f4f87cf389858166da4612e94d01deb9fd6844 Mon Sep 17 00:00:00 2001 +From c180f32a504b094bc68c03280d7a8e8e8cf0cf95 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 00000000..a3b17461 +index 0000000000..a3b174618d --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/util/ReentrantLockWithGetOwner.java @@ -0,0 +1,11 @@ @@ -22,7 +22,7 @@ index 00000000..a3b17461 + } +} diff --git a/src/main/java/net/minecraft/server/DataPaletteBlock.java b/src/main/java/net/minecraft/server/DataPaletteBlock.java -index d5f5a518..2c1d1b1a 100644 +index d5f5a51872..2c1d1b1a55 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 d5f5a518..2c1d1b1a 100644 crashreportsystemdetails.a("Thread dumps", (Object) s); -- -2.25.1.windows.1 +2.26.2 diff --git a/Spigot-Server-Patches/0383-Use-ChunkStatus-cache-when-saving-protochunks.patch b/Spigot-Server-Patches/0383-Use-ChunkStatus-cache-when-saving-protochunks.patch index 01bea8c048..e61e84aaad 100644 --- a/Spigot-Server-Patches/0383-Use-ChunkStatus-cache-when-saving-protochunks.patch +++ b/Spigot-Server-Patches/0383-Use-ChunkStatus-cache-when-saving-protochunks.patch @@ -1,4 +1,4 @@ -From eb891508576479e5570e9277ff43aaa53af0c7ee Mon Sep 17 00:00:00 2001 +From e53e308d6a701526060a32bbf18768a917f308f8 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,7 +7,7 @@ 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 57b1341b..5ac37072 100644 +index 405f57874e..c9c25cdb8e 100644 --- a/src/main/java/net/minecraft/server/PlayerChunkMap.java +++ b/src/main/java/net/minecraft/server/PlayerChunkMap.java @@ -844,8 +844,10 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d { @@ -24,5 +24,5 @@ index 57b1341b..5ac37072 100644 } -- -2.25.1.windows.1 +2.26.2 diff --git a/Spigot-Server-Patches/0384-Anti-Xray.patch b/Spigot-Server-Patches/0384-Anti-Xray.patch index b7778fe2bc..82b2eba745 100644 --- a/Spigot-Server-Patches/0384-Anti-Xray.patch +++ b/Spigot-Server-Patches/0384-Anti-Xray.patch @@ -1,11 +1,11 @@ -From 92488927543b5f3df2f3833f2d179fb8c8059ecc Mon Sep 17 00:00:00 2001 +From 3e2e32910c3a6bf594339dece51f0618de7a8506 Mon Sep 17 00:00:00 2001 From: stonar96 Date: Mon, 20 Aug 2018 03:03:58 +0200 Subject: [PATCH] Anti-Xray diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index 48676152..df24e329 100644 +index 4867615215..df24e3297b 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java @@ -1,7 +1,11 @@ @@ -66,7 +66,7 @@ index 48676152..df24e329 100644 } diff --git a/src/main/java/com/destroystokyo/paper/antixray/ChunkPacketBlockController.java b/src/main/java/com/destroystokyo/paper/antixray/ChunkPacketBlockController.java new file mode 100644 -index 00000000..f7e376ce +index 0000000000..f7e376ce6a --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/antixray/ChunkPacketBlockController.java @@ -0,0 +1,46 @@ @@ -118,7 +118,7 @@ index 00000000..f7e376ce +} diff --git a/src/main/java/com/destroystokyo/paper/antixray/ChunkPacketBlockControllerAntiXray.java b/src/main/java/com/destroystokyo/paper/antixray/ChunkPacketBlockControllerAntiXray.java new file mode 100644 -index 00000000..23626bef +index 0000000000..23626bef3a --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/antixray/ChunkPacketBlockControllerAntiXray.java @@ -0,0 +1,782 @@ @@ -906,7 +906,7 @@ index 00000000..23626bef +} diff --git a/src/main/java/com/destroystokyo/paper/antixray/ChunkPacketInfo.java b/src/main/java/com/destroystokyo/paper/antixray/ChunkPacketInfo.java new file mode 100644 -index 00000000..a68bace3 +index 0000000000..a68bace353 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/antixray/ChunkPacketInfo.java @@ -0,0 +1,81 @@ @@ -993,7 +993,7 @@ index 00000000..a68bace3 +} diff --git a/src/main/java/com/destroystokyo/paper/antixray/ChunkPacketInfoAntiXray.java b/src/main/java/com/destroystokyo/paper/antixray/ChunkPacketInfoAntiXray.java new file mode 100644 -index 00000000..067dfb2f +index 0000000000..067dfb2f14 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/antixray/ChunkPacketInfoAntiXray.java @@ -0,0 +1,31 @@ @@ -1030,7 +1030,7 @@ index 00000000..067dfb2f +} diff --git a/src/main/java/com/destroystokyo/paper/antixray/DataBitsReader.java b/src/main/java/com/destroystokyo/paper/antixray/DataBitsReader.java new file mode 100644 -index 00000000..cc586827 +index 0000000000..cc586827aa --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/antixray/DataBitsReader.java @@ -0,0 +1,56 @@ @@ -1092,7 +1092,7 @@ index 00000000..cc586827 +} diff --git a/src/main/java/com/destroystokyo/paper/antixray/DataBitsWriter.java b/src/main/java/com/destroystokyo/paper/antixray/DataBitsWriter.java new file mode 100644 -index 00000000..37093419 +index 0000000000..37093419cf --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/antixray/DataBitsWriter.java @@ -0,0 +1,84 @@ @@ -1181,7 +1181,7 @@ index 00000000..37093419 + } +} diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java -index d6637f3d..bdd04305 100644 +index 4b77934c39..9ce9542b80 100644 --- a/src/main/java/net/minecraft/server/Chunk.java +++ b/src/main/java/net/minecraft/server/Chunk.java @@ -402,7 +402,7 @@ public class Chunk implements IChunkAccess { @@ -1194,7 +1194,7 @@ index d6637f3d..bdd04305 100644 } diff --git a/src/main/java/net/minecraft/server/ChunkRegionLoader.java b/src/main/java/net/minecraft/server/ChunkRegionLoader.java -index 47e074a1..8816c90e 100644 +index 8e4b3e52cb..79e85520f3 100644 --- a/src/main/java/net/minecraft/server/ChunkRegionLoader.java +++ b/src/main/java/net/minecraft/server/ChunkRegionLoader.java @@ -57,7 +57,7 @@ public class ChunkRegionLoader { @@ -1216,7 +1216,7 @@ index 47e074a1..8816c90e 100644 protochunk.a(biomestorage); object = protochunk; diff --git a/src/main/java/net/minecraft/server/ChunkSection.java b/src/main/java/net/minecraft/server/ChunkSection.java -index 0d5deee3..4526527a 100644 +index 0d5deee365..4526527aca 100644 --- a/src/main/java/net/minecraft/server/ChunkSection.java +++ b/src/main/java/net/minecraft/server/ChunkSection.java @@ -6,21 +6,31 @@ public class ChunkSection { @@ -1255,7 +1255,7 @@ index 0d5deee3..4526527a 100644 public IBlockData getType(int i, int j, int k) { diff --git a/src/main/java/net/minecraft/server/DataPaletteBlock.java b/src/main/java/net/minecraft/server/DataPaletteBlock.java -index 2c1d1b1a..44aed672 100644 +index 2c1d1b1a55..44aed67274 100644 --- a/src/main/java/net/minecraft/server/DataPaletteBlock.java +++ b/src/main/java/net/minecraft/server/DataPaletteBlock.java @@ -3,6 +3,7 @@ package net.minecraft.server; @@ -1377,7 +1377,7 @@ index 2c1d1b1a..44aed672 100644 if (this.h == this.b) { diff --git a/src/main/java/net/minecraft/server/NetworkManager.java b/src/main/java/net/minecraft/server/NetworkManager.java -index e156804f..96a785af 100644 +index e156804f7a..96a785af27 100644 --- a/src/main/java/net/minecraft/server/NetworkManager.java +++ b/src/main/java/net/minecraft/server/NetworkManager.java @@ -42,7 +42,7 @@ public class NetworkManager extends SimpleChannelInboundHandler> { @@ -1440,7 +1440,7 @@ index e156804f..96a785af 100644 public void a() { this.o(); diff --git a/src/main/java/net/minecraft/server/PacketPlayOutMapChunk.java b/src/main/java/net/minecraft/server/PacketPlayOutMapChunk.java -index 47710067..ef7ade79 100644 +index 47710067a6..ef7ade797b 100644 --- a/src/main/java/net/minecraft/server/PacketPlayOutMapChunk.java +++ b/src/main/java/net/minecraft/server/PacketPlayOutMapChunk.java @@ -1,5 +1,6 @@ @@ -1533,7 +1533,7 @@ index 47710067..ef7ade79 100644 } diff --git a/src/main/java/net/minecraft/server/PlayerChunk.java b/src/main/java/net/minecraft/server/PlayerChunk.java -index 040d4b41..f1620ba8 100644 +index 040d4b41ea..f1620ba80e 100644 --- a/src/main/java/net/minecraft/server/PlayerChunk.java +++ b/src/main/java/net/minecraft/server/PlayerChunk.java @@ -223,6 +223,11 @@ public class PlayerChunk { @@ -1558,7 +1558,7 @@ index 040d4b41..f1620ba8 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 5ac37072..b4c9d544 100644 +index c9c25cdb8e..9c627bf3b4 100644 --- a/src/main/java/net/minecraft/server/PlayerChunkMap.java +++ b/src/main/java/net/minecraft/server/PlayerChunkMap.java @@ -603,7 +603,7 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d { @@ -1580,7 +1580,7 @@ index 5ac37072..b4c9d544 100644 } diff --git a/src/main/java/net/minecraft/server/PlayerInteractManager.java b/src/main/java/net/minecraft/server/PlayerInteractManager.java -index 17b7edda..ce66090b 100644 +index 17b7eddac4..ce66090b8d 100644 --- a/src/main/java/net/minecraft/server/PlayerInteractManager.java +++ b/src/main/java/net/minecraft/server/PlayerInteractManager.java @@ -266,6 +266,8 @@ public class PlayerInteractManager { @@ -1593,7 +1593,7 @@ index 17b7edda..ce66090b 100644 public void a(BlockPosition blockposition, PacketPlayInBlockDig.EnumPlayerDigType packetplayinblockdig_enumplayerdigtype, String s) { diff --git a/src/main/java/net/minecraft/server/ProtoChunk.java b/src/main/java/net/minecraft/server/ProtoChunk.java -index 39339fa2..f376e210 100644 +index 39339fa275..f376e21068 100644 --- a/src/main/java/net/minecraft/server/ProtoChunk.java +++ b/src/main/java/net/minecraft/server/ProtoChunk.java @@ -45,16 +45,28 @@ public class ProtoChunk implements IChunkAccess { @@ -1636,7 +1636,7 @@ index 39339fa2..f376e210 100644 return this.j[i]; diff --git a/src/main/java/net/minecraft/server/TicketType.java b/src/main/java/net/minecraft/server/TicketType.java -index 75ab9f18..4cf28bc2 100644 +index 75ab9f185b..4cf28bc2df 100644 --- a/src/main/java/net/minecraft/server/TicketType.java +++ b/src/main/java/net/minecraft/server/TicketType.java @@ -22,6 +22,7 @@ public class TicketType { @@ -1648,7 +1648,7 @@ index 75ab9f18..4cf28bc2 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 8cf3c102..0bde1717 100644 +index 8cf3c10274..0bde171743 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -2,6 +2,8 @@ package net.minecraft.server; @@ -1685,7 +1685,7 @@ index 8cf3c102..0bde1717 100644 if (iblockdata1 == null) { // CraftBukkit start - remove blockstate if failed (or the same) diff --git a/src/main/java/org/bukkit/craftbukkit/generator/CraftChunkData.java b/src/main/java/org/bukkit/craftbukkit/generator/CraftChunkData.java -index 8191e7c3..969d548d 100644 +index 8191e7c348..969d548de2 100644 --- a/src/main/java/org/bukkit/craftbukkit/generator/CraftChunkData.java +++ b/src/main/java/org/bukkit/craftbukkit/generator/CraftChunkData.java @@ -21,9 +21,11 @@ public final class CraftChunkData implements ChunkGenerator.ChunkData { @@ -1710,5 +1710,5 @@ index 8191e7c3..969d548d 100644 return section; } -- -2.25.1.windows.1 +2.26.2 diff --git a/Spigot-Server-Patches/0385-Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch b/Spigot-Server-Patches/0385-Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch index b82ac4881b..b7747c1432 100644 --- a/Spigot-Server-Patches/0385-Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch +++ b/Spigot-Server-Patches/0385-Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch @@ -1,4 +1,4 @@ -From 5e4e2326df2b5c668c1bf9259b0ac774836ebdc9 Mon Sep 17 00:00:00 2001 +From f77fcf79437fced19d5ccef532ec98b15c276de7 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 @@ -17,7 +17,7 @@ This should fully solve all of the issues around it so that only natural influences natural spawns. diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index df24e329..4c501093 100644 +index df24e3297b..4c50109365 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java @@ -507,6 +507,16 @@ public class PaperWorldConfig { @@ -38,7 +38,7 @@ index df24e329..4c501093 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 62c22750..6654b919 100644 +index 62c2275098..6654b91998 100644 --- a/src/main/java/net/minecraft/server/WorldServer.java +++ b/src/main/java/net/minecraft/server/WorldServer.java @@ -957,6 +957,13 @@ public class WorldServer extends World { @@ -56,5 +56,5 @@ index 62c22750..6654b919 100644 } } -- -2.25.1.windows.1 +2.26.2 diff --git a/Spigot-Server-Patches/0386-Configurable-projectile-relative-velocity.patch b/Spigot-Server-Patches/0386-Configurable-projectile-relative-velocity.patch index f3c0bf6bc9..66548fe2cb 100644 --- a/Spigot-Server-Patches/0386-Configurable-projectile-relative-velocity.patch +++ b/Spigot-Server-Patches/0386-Configurable-projectile-relative-velocity.patch @@ -1,4 +1,4 @@ -From 3a6c4838819ae04871ee80d8c940bdc3783e373e Mon Sep 17 00:00:00 2001 +From 0efdcafd549e5d42d9d5adb890fed341268ab025 Mon Sep 17 00:00:00 2001 From: Lucavon Date: Tue, 23 Jul 2019 20:29:20 -0500 Subject: [PATCH] Configurable projectile relative velocity @@ -25,7 +25,7 @@ P3) Solutions for 1) and especially 2) might not be future-proof, while this server-internal fix makes this change future-proof. diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index 4c501093..a09282e0 100644 +index 4c50109365..a09282e00e 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java @@ -555,4 +555,9 @@ public class PaperWorldConfig { @@ -39,7 +39,7 @@ index 4c501093..a09282e0 100644 + } } diff --git a/src/main/java/net/minecraft/server/EntityArrow.java b/src/main/java/net/minecraft/server/EntityArrow.java -index 634e2bd3..9c97edf9 100644 +index 634e2bd304..9c97edf9c9 100644 --- a/src/main/java/net/minecraft/server/EntityArrow.java +++ b/src/main/java/net/minecraft/server/EntityArrow.java @@ -85,7 +85,7 @@ public abstract class EntityArrow extends Entity implements IProjectile { @@ -52,7 +52,7 @@ index 634e2bd3..9c97edf9 100644 @Override diff --git a/src/main/java/net/minecraft/server/EntityProjectile.java b/src/main/java/net/minecraft/server/EntityProjectile.java -index 6c091b68..f5c8074d 100644 +index 6c091b6808..f5c8074dcf 100644 --- a/src/main/java/net/minecraft/server/EntityProjectile.java +++ b/src/main/java/net/minecraft/server/EntityProjectile.java @@ -43,7 +43,7 @@ public abstract class EntityProjectile extends Entity implements IProjectile { @@ -65,5 +65,5 @@ index 6c091b68..f5c8074d 100644 @Override -- -2.25.1.windows.1 +2.26.2 diff --git a/Spigot-Server-Patches/0387-Mark-entities-as-being-ticked-when-notifying-navigat.patch b/Spigot-Server-Patches/0387-Mark-entities-as-being-ticked-when-notifying-navigat.patch index 62182b7fa3..f83ae54bfa 100644 --- a/Spigot-Server-Patches/0387-Mark-entities-as-being-ticked-when-notifying-navigat.patch +++ b/Spigot-Server-Patches/0387-Mark-entities-as-being-ticked-when-notifying-navigat.patch @@ -1,11 +1,11 @@ -From db89e84499020ae2000c5f4405903dd7f31c5b73 Mon Sep 17 00:00:00 2001 +From 59f09c7598e4673d09acea5493d2e8b1b8231d54 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 6654b919..e3913952 100644 +index 6654b91998..e3913952d9 100644 --- a/src/main/java/net/minecraft/server/WorldServer.java +++ b/src/main/java/net/minecraft/server/WorldServer.java @@ -1412,6 +1412,7 @@ public class WorldServer extends World { @@ -25,5 +25,5 @@ index 6654b919..e3913952 100644 } -- -2.25.1.windows.1 +2.26.2 diff --git a/Spigot-Server-Patches/0388-offset-item-frame-ticking.patch b/Spigot-Server-Patches/0388-offset-item-frame-ticking.patch index 6ce82be940..0bca33c64b 100644 --- a/Spigot-Server-Patches/0388-offset-item-frame-ticking.patch +++ b/Spigot-Server-Patches/0388-offset-item-frame-ticking.patch @@ -1,11 +1,11 @@ -From 841aa2b0479198505c44364b6c0f74f76fe3b408 Mon Sep 17 00:00:00 2001 +From 98908628b9c29971f4722aed224482f50070323d 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 21dbc9b2..ef9c4717 100644 +index 21dbc9b2ab..ef9c4717c3 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 21dbc9b2..ef9c4717 100644 protected EnumDirection direction; -- -2.25.1.windows.1 +2.26.2 diff --git a/Spigot-Server-Patches/0389-Avoid-hopper-searches-if-there-are-no-items.patch b/Spigot-Server-Patches/0389-Avoid-hopper-searches-if-there-are-no-items.patch index 76f8a04f08..268ea398fc 100644 --- a/Spigot-Server-Patches/0389-Avoid-hopper-searches-if-there-are-no-items.patch +++ b/Spigot-Server-Patches/0389-Avoid-hopper-searches-if-there-are-no-items.patch @@ -1,4 +1,4 @@ -From 9884366681850e0b0653f26f7dcf2e0105277ed2 Mon Sep 17 00:00:00 2001 +From 386dbf3369631411cc400ec7852ae290d9bcd655 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 bdd04305f5..29cfef1605 100644 +index 9ce9542b80..a23dfeb63d 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 { @@ -112,5 +112,5 @@ index 498f381099..a2d1ef3602 100644 return entity instanceof IInventory && entity.isAlive(); }; -- -2.25.1 +2.26.2 diff --git a/Spigot-Server-Patches/0390-Asynchronous-chunk-IO-and-loading.patch b/Spigot-Server-Patches/0390-Asynchronous-chunk-IO-and-loading.patch index bf685e78a5..28a50a1a63 100644 --- a/Spigot-Server-Patches/0390-Asynchronous-chunk-IO-and-loading.patch +++ b/Spigot-Server-Patches/0390-Asynchronous-chunk-IO-and-loading.patch @@ -1,4 +1,4 @@ -From e486a08f08f4cb5fe6791d889f77889cd4b8c831 Mon Sep 17 00:00:00 2001 +From 748db0d90c3cc343b0dadb663f4f6ccad2b6161a 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 @@ -4089,7 +4089,7 @@ index e3913952d9..3db0ad0a46 100644 } public void removeTicketsForSpawn(int radiusInBlocks, BlockPosition spawn) { diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -index 4fa16e167c..94a9a16a88 100644 +index 50467656df..d3ac0ffe46 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java @@ -556,22 +556,23 @@ public class CraftWorld implements World { @@ -4124,7 +4124,7 @@ index 4fa16e167c..94a9a16a88 100644 // fall through to load // we do this so we do not re-read the chunk data on disk -@@ -2445,6 +2446,24 @@ public class CraftWorld implements World { +@@ -2443,6 +2444,24 @@ public class CraftWorld implements World { return new CraftDragonBattle(((WorldProviderTheEnd) worldProvider).o()); // PAIL rename getDragonBattle } diff --git a/Spigot-Server-Patches/0391-Use-getChunkIfLoadedImmediately-in-places.patch b/Spigot-Server-Patches/0391-Use-getChunkIfLoadedImmediately-in-places.patch index 1f8c19dd0c..09b7065353 100644 --- a/Spigot-Server-Patches/0391-Use-getChunkIfLoadedImmediately-in-places.patch +++ b/Spigot-Server-Patches/0391-Use-getChunkIfLoadedImmediately-in-places.patch @@ -1,4 +1,4 @@ -From bd020770748fe0dee966f8d73431a8f0da868e35 Mon Sep 17 00:00:00 2001 +From 2b2289ac4de87e51fb19efa3b9026657a8e4e232 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/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java -index 691331217b..f88bcb29db 100644 +index 65c171cec3..f00653dfe7 100644 --- a/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java @@ -989,7 +989,7 @@ public class PlayerConnection implements PacketListenerPlayIn { @@ -86,5 +86,5 @@ index f86404f83a..92601c581c 100644 } } -- -2.25.1 +2.26.2 diff --git a/Spigot-Server-Patches/0392-Reduce-sync-loads.patch b/Spigot-Server-Patches/0392-Reduce-sync-loads.patch index db2a30fdad..f6b0216645 100644 --- a/Spigot-Server-Patches/0392-Reduce-sync-loads.patch +++ b/Spigot-Server-Patches/0392-Reduce-sync-loads.patch @@ -1,4 +1,4 @@ -From f2de347a5ea40b9cceaaefcf899dfd0f52394a30 Mon Sep 17 00:00:00 2001 +From c3fba670ea1762ac634d8153ad202832ba0de639 Mon Sep 17 00:00:00 2001 From: Spottedleaf Date: Fri, 19 Jul 2019 03:29:14 -0700 Subject: [PATCH] Reduce sync loads diff --git a/Spigot-Server-Patches/0393-Implement-alternative-item-despawn-rate.patch b/Spigot-Server-Patches/0393-Implement-alternative-item-despawn-rate.patch index 66491aa2d3..192a9f43a2 100644 --- a/Spigot-Server-Patches/0393-Implement-alternative-item-despawn-rate.patch +++ b/Spigot-Server-Patches/0393-Implement-alternative-item-despawn-rate.patch @@ -1,11 +1,11 @@ -From 8db8675c79cb610fc4ffd87362cb112e9ea4b223 Mon Sep 17 00:00:00 2001 +From 13a14cbebd37e1738e91f4b7064ee6d6dcefdce8 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/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index a09282e0..9d9260ad 100644 +index a09282e00e..9d9260ad07 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java @@ -1,12 +1,17 @@ @@ -80,7 +80,7 @@ index a09282e0..9d9260ad 100644 + } } diff --git a/src/main/java/net/minecraft/server/EntityItem.java b/src/main/java/net/minecraft/server/EntityItem.java -index ef2cf656..507627a2 100644 +index ef2cf6565b..507627a29f 100644 --- a/src/main/java/net/minecraft/server/EntityItem.java +++ b/src/main/java/net/minecraft/server/EntityItem.java @@ -6,6 +6,7 @@ import java.util.Objects; @@ -128,5 +128,5 @@ index ef2cf656..507627a2 100644 public Packet L() { return new PacketPlayOutSpawnEntity(this); -- -2.25.1.windows.1 +2.26.2 diff --git a/Spigot-Server-Patches/0394-Do-less-work-if-we-have-a-custom-Bukkit-generator.patch b/Spigot-Server-Patches/0394-Do-less-work-if-we-have-a-custom-Bukkit-generator.patch index 2fe3b8ebb3..8ab9638cc5 100644 --- a/Spigot-Server-Patches/0394-Do-less-work-if-we-have-a-custom-Bukkit-generator.patch +++ b/Spigot-Server-Patches/0394-Do-less-work-if-we-have-a-custom-Bukkit-generator.patch @@ -1,4 +1,4 @@ -From d5d999e4e41fe0d27c29e380a93ed4cb2d01df23 Mon Sep 17 00:00:00 2001 +From 0fdda81892adc2da343950e2519dbf8bacc60060 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,7 +7,7 @@ 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 0d25529b..149600ae 100644 +index 5f2c425129..f9aed78188 100644 --- a/src/main/java/net/minecraft/server/WorldServer.java +++ b/src/main/java/net/minecraft/server/WorldServer.java @@ -811,12 +811,13 @@ public class WorldServer extends World { @@ -45,5 +45,5 @@ index 0d25529b..149600ae 100644 WorldServer.LOGGER.warn("Unable to find spawn biome"); } -- -2.25.1.windows.1 +2.26.2 diff --git a/Spigot-Server-Patches/0395-Fix-MC-158900.patch b/Spigot-Server-Patches/0395-Fix-MC-158900.patch index a269fae36a..48ed05328b 100644 --- a/Spigot-Server-Patches/0395-Fix-MC-158900.patch +++ b/Spigot-Server-Patches/0395-Fix-MC-158900.patch @@ -1,4 +1,4 @@ -From 50d56c93f1111f23a0a36d4b426933801998c826 Mon Sep 17 00:00:00 2001 +From ad4120163dd9b8c6433cadcee4ef912132fa72e6 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 765ebe2c..0ccfd8de 100644 +index 765ebe2ccf..0ccfd8de0f 100644 --- a/src/main/java/net/minecraft/server/PlayerList.java +++ b/src/main/java/net/minecraft/server/PlayerList.java @@ -500,8 +500,10 @@ public abstract class PlayerList { @@ -24,5 +24,5 @@ index 765ebe2c..0ccfd8de 100644 chatmessage = new ChatMessage("multiplayer.disconnect.banned.reason", new Object[]{gameprofilebanentry.getReason()}); if (gameprofilebanentry.getExpires() != null) { -- -2.25.1.windows.1 +2.26.2 diff --git a/Spigot-Server-Patches/0396-implement-optional-per-player-mob-spawns.patch b/Spigot-Server-Patches/0396-implement-optional-per-player-mob-spawns.patch index 482e4a9c4d..2c52c1ab2f 100644 --- a/Spigot-Server-Patches/0396-implement-optional-per-player-mob-spawns.patch +++ b/Spigot-Server-Patches/0396-implement-optional-per-player-mob-spawns.patch @@ -1,4 +1,4 @@ -From 7dbac71b45319a51ad6f2f33f0616d06ace55f71 Mon Sep 17 00:00:00 2001 +From 286402aba0b28823b89468bffb9e650c76311313 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 diff --git a/Spigot-Server-Patches/0397-Prevent-consuming-the-wrong-itemstack.patch b/Spigot-Server-Patches/0397-Prevent-consuming-the-wrong-itemstack.patch index 5c0c9cd0cc..9e4b2400f8 100644 --- a/Spigot-Server-Patches/0397-Prevent-consuming-the-wrong-itemstack.patch +++ b/Spigot-Server-Patches/0397-Prevent-consuming-the-wrong-itemstack.patch @@ -1,4 +1,4 @@ -From 0e0519635bb011273b6b66413bfb6fba28109ec2 Mon Sep 17 00:00:00 2001 +From d34d69baed9c9e1ed4e99560e1c9c2f9d513a6e1 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/Spigot-Server-Patches/0398-only-add-passanger-entities-once-from-spawners.patch b/Spigot-Server-Patches/0398-only-add-passanger-entities-once-from-spawners.patch index b897e0bc1a..427ae748c0 100644 --- a/Spigot-Server-Patches/0398-only-add-passanger-entities-once-from-spawners.patch +++ b/Spigot-Server-Patches/0398-only-add-passanger-entities-once-from-spawners.patch @@ -1,11 +1,11 @@ -From 176dd584e7bd6449290e4fd2623491269521e870 Mon Sep 17 00:00:00 2001 +From 4e50ea6ae7ef2ced7f56dfddaf7adde624292800 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 41001b02..df494d37 100644 +index 41001b02a6..df494d37be 100644 --- a/src/main/java/net/minecraft/server/MobSpawnerAbstract.java +++ b/src/main/java/net/minecraft/server/MobSpawnerAbstract.java @@ -196,7 +196,7 @@ public abstract class MobSpawnerAbstract { @@ -18,5 +18,5 @@ index 41001b02..df494d37 100644 while (iterator.hasNext()) { -- -2.25.1.windows.1 +2.26.2 diff --git a/Spigot-Server-Patches/0399-Fix-nether-portal-creation.patch b/Spigot-Server-Patches/0399-Fix-nether-portal-creation.patch index 555babc058..253ce6fbdc 100644 --- a/Spigot-Server-Patches/0399-Fix-nether-portal-creation.patch +++ b/Spigot-Server-Patches/0399-Fix-nether-portal-creation.patch @@ -1,11 +1,11 @@ -From 4a82948c37d115ae334953b480d20cf98fa9671a Mon Sep 17 00:00:00 2001 +From b7b94c91cc3ccaf702145a2e0dc2acc9c07f326e 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 60330f75..c22dbbfb 100644 +index 60330f753f..c22dbbfbe8 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 60330f75..c22dbbfb 100644 state.setData(data); list.put(position, state); -- -2.25.1.windows.1 +2.26.2 diff --git a/Spigot-Server-Patches/0400-Generator-Settings.patch b/Spigot-Server-Patches/0400-Generator-Settings.patch index 75d5e6fc6a..2fbd286caa 100644 --- a/Spigot-Server-Patches/0400-Generator-Settings.patch +++ b/Spigot-Server-Patches/0400-Generator-Settings.patch @@ -1,11 +1,11 @@ -From 585732923abd12bdc309aa00db38c8ca4c1b5194 Mon Sep 17 00:00:00 2001 +From 290425bd369b23ac8a78758a5370a6025aa00252 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/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index fd3dbea6..e790326c 100644 +index fd3dbea628..e790326c9c 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java @@ -618,4 +618,9 @@ public class PaperWorldConfig { @@ -19,7 +19,7 @@ index fd3dbea6..e790326c 100644 + } } diff --git a/src/main/java/net/minecraft/server/ChunkGeneratorAbstract.java b/src/main/java/net/minecraft/server/ChunkGeneratorAbstract.java -index af81a841..2268fbdd 100644 +index af81a84142..2268fbdd87 100644 --- a/src/main/java/net/minecraft/server/ChunkGeneratorAbstract.java +++ b/src/main/java/net/minecraft/server/ChunkGeneratorAbstract.java @@ -211,8 +211,8 @@ public abstract class ChunkGeneratorAbstract @@ -52,5 +52,5 @@ index af81a841..2268fbdd 100644 } } -- -2.25.1.windows.1 +2.26.2 diff --git a/Spigot-Server-Patches/0401-Fix-zero-tick-instant-grow-farms-MC-113809.patch b/Spigot-Server-Patches/0401-Fix-zero-tick-instant-grow-farms-MC-113809.patch index 5835953994..cbc81c480b 100644 --- a/Spigot-Server-Patches/0401-Fix-zero-tick-instant-grow-farms-MC-113809.patch +++ b/Spigot-Server-Patches/0401-Fix-zero-tick-instant-grow-farms-MC-113809.patch @@ -1,11 +1,11 @@ -From 246b338a2cd3c52c808e21959f343c04968e1b9c Mon Sep 17 00:00:00 2001 +From 5fed7f9ec8c8aa7a94b1a4e595918b4f8013a071 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 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index e790326c..c37a0f03 100644 +index e790326c9c..c37a0f035d 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java @@ -566,6 +566,11 @@ public class PaperWorldConfig { @@ -21,7 +21,7 @@ index e790326c..c37a0f03 100644 public Map altItemDespawnRateMap; private void altItemDespawnRate() { diff --git a/src/main/java/net/minecraft/server/Block.java b/src/main/java/net/minecraft/server/Block.java -index 540fcce1..e29ec958 100644 +index 540fcce1dd..e29ec958b3 100644 --- a/src/main/java/net/minecraft/server/Block.java +++ b/src/main/java/net/minecraft/server/Block.java @@ -46,6 +46,7 @@ public class Block implements IMaterial { @@ -33,7 +33,7 @@ index 540fcce1..e29ec958 100644 private final boolean i; private final boolean j; diff --git a/src/main/java/net/minecraft/server/BlockBamboo.java b/src/main/java/net/minecraft/server/BlockBamboo.java -index c482aad3..02c548dd 100644 +index c482aad3e3..02c548dd9c 100644 --- a/src/main/java/net/minecraft/server/BlockBamboo.java +++ b/src/main/java/net/minecraft/server/BlockBamboo.java @@ -85,6 +85,7 @@ public class BlockBamboo extends Block implements IBlockFragilePlantElement { @@ -45,7 +45,7 @@ index c482aad3..02c548dd 100644 int i = this.b(worldserver, blockposition) + 1; diff --git a/src/main/java/net/minecraft/server/BlockCactus.java b/src/main/java/net/minecraft/server/BlockCactus.java -index e0974e25..3524fcb9 100644 +index e0974e256f..3524fcb927 100644 --- a/src/main/java/net/minecraft/server/BlockCactus.java +++ b/src/main/java/net/minecraft/server/BlockCactus.java @@ -21,6 +21,7 @@ public class BlockCactus extends Block { @@ -57,7 +57,7 @@ index e0974e25..3524fcb9 100644 if (worldserver.isEmpty(blockposition1)) { diff --git a/src/main/java/net/minecraft/server/BlockChorusFlower.java b/src/main/java/net/minecraft/server/BlockChorusFlower.java -index d70b52ca..b624cf38 100644 +index d70b52cadf..b624cf3804 100644 --- a/src/main/java/net/minecraft/server/BlockChorusFlower.java +++ b/src/main/java/net/minecraft/server/BlockChorusFlower.java @@ -22,6 +22,7 @@ public class BlockChorusFlower extends Block { @@ -69,7 +69,7 @@ index d70b52ca..b624cf38 100644 if (worldserver.isEmpty(blockposition1) && blockposition1.getY() < 256) { diff --git a/src/main/java/net/minecraft/server/BlockReed.java b/src/main/java/net/minecraft/server/BlockReed.java -index 55b07444..3bc3c5aa 100644 +index 55b07444e1..3bc3c5aa29 100644 --- a/src/main/java/net/minecraft/server/BlockReed.java +++ b/src/main/java/net/minecraft/server/BlockReed.java @@ -23,6 +23,7 @@ public class BlockReed extends Block { @@ -81,7 +81,7 @@ index 55b07444..3bc3c5aa 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 b164ee89..81590e47 100644 +index fd8ca2a510..06d693ca2c 100644 --- a/src/main/java/net/minecraft/server/WorldServer.java +++ b/src/main/java/net/minecraft/server/WorldServer.java @@ -589,7 +589,9 @@ public class WorldServer extends World { @@ -95,5 +95,5 @@ index b164ee89..81590e47 100644 Fluid fluid = iblockdata.getFluid(); -- -2.25.1.windows.1 +2.26.2 diff --git a/Spigot-Server-Patches/0402-Fix-MC-161754.patch b/Spigot-Server-Patches/0402-Fix-MC-161754.patch index 64675324f0..f9e8ccd0f4 100644 --- a/Spigot-Server-Patches/0402-Fix-MC-161754.patch +++ b/Spigot-Server-Patches/0402-Fix-MC-161754.patch @@ -1,4 +1,4 @@ -From 7e878cc51acc1dfc7b9623baf17e12afe7f0cc83 Mon Sep 17 00:00:00 2001 +From e80c30ecea0cd61d59efd03f42d86aa352f52288 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 c95ce012..18e1ae7f 100644 +index c95ce0124d..18e1ae7f0a 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 c95ce012..18e1ae7f 100644 @Override -- -2.25.1.windows.1 +2.26.2 diff --git a/Spigot-Server-Patches/0403-Performance-improvement-for-Chunk.getEntities.patch b/Spigot-Server-Patches/0403-Performance-improvement-for-Chunk.getEntities.patch index 47194b26d7..db8fa5cc5f 100644 --- a/Spigot-Server-Patches/0403-Performance-improvement-for-Chunk.getEntities.patch +++ b/Spigot-Server-Patches/0403-Performance-improvement-for-Chunk.getEntities.patch @@ -1,4 +1,4 @@ -From e4e41e06f9557a9f8699f3e46a08e0a120153e71 Mon Sep 17 00:00:00 2001 +From f753ddd40c035673950e3c881ac4acbf616be093 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 diff --git a/Spigot-Server-Patches/0404-Fix-spawning-of-hanging-entities-that-are-not-ItemFr.patch b/Spigot-Server-Patches/0404-Fix-spawning-of-hanging-entities-that-are-not-ItemFr.patch index 2a86af0a28..f462606ac9 100644 --- a/Spigot-Server-Patches/0404-Fix-spawning-of-hanging-entities-that-are-not-ItemFr.patch +++ b/Spigot-Server-Patches/0404-Fix-spawning-of-hanging-entities-that-are-not-ItemFr.patch @@ -1,4 +1,4 @@ -From c0665abbedaadecfc037a9aa903dd94e63afdfc1 Mon Sep 17 00:00:00 2001 +From 4789f5c27a2ea3e518a3f78851fd3fbe00112e12 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,10 +6,10 @@ 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 94a9a16a88..9e0979c9b3 100644 +index d3ac0ffe46..07ebd78acc 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -@@ -1852,7 +1852,12 @@ public class CraftWorld implements World { +@@ -1850,7 +1850,12 @@ public class CraftWorld implements World { height = 9; } diff --git a/Spigot-Server-Patches/0405-Expose-the-internal-current-tick.patch b/Spigot-Server-Patches/0405-Expose-the-internal-current-tick.patch index 89da31cc5a..4174289149 100644 --- a/Spigot-Server-Patches/0405-Expose-the-internal-current-tick.patch +++ b/Spigot-Server-Patches/0405-Expose-the-internal-current-tick.patch @@ -1,4 +1,4 @@ -From 7fe03f5de64ce618f775b8ee89da809c162b8ae0 Mon Sep 17 00:00:00 2001 +From 6de8b1c9d9c2b2625156ab0f7346f9e6a357c728 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/Spigot-Server-Patches/0406-Fix-stuck-in-sneak-when-changing-worlds-MC-10657.patch b/Spigot-Server-Patches/0406-Fix-stuck-in-sneak-when-changing-worlds-MC-10657.patch index 77a7f3e296..4440a59c3e 100644 --- a/Spigot-Server-Patches/0406-Fix-stuck-in-sneak-when-changing-worlds-MC-10657.patch +++ b/Spigot-Server-Patches/0406-Fix-stuck-in-sneak-when-changing-worlds-MC-10657.patch @@ -1,4 +1,4 @@ -From f8b387807bd9af8ee0c20c6771c840d7699cc904 Mon Sep 17 00:00:00 2001 +From f2ace7ce845cb625a87b25a448a47d1c77db352c 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/Spigot-Server-Patches/0407-Add-option-to-disable-pillager-patrols.patch b/Spigot-Server-Patches/0407-Add-option-to-disable-pillager-patrols.patch index ae1df1887b..33fd6ecd94 100644 --- a/Spigot-Server-Patches/0407-Add-option-to-disable-pillager-patrols.patch +++ b/Spigot-Server-Patches/0407-Add-option-to-disable-pillager-patrols.patch @@ -1,11 +1,11 @@ -From 5d9dfbce4ffdc4809b44ce4cb27a95deea7a1d5c Mon Sep 17 00:00:00 2001 +From e83f3c71bce7c2e5d6532050e3760afa7a6a09a1 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 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index c37a0f03..3bbf77a8 100644 +index c37a0f035d..3bbf77a8ec 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java @@ -628,4 +628,9 @@ public class PaperWorldConfig { @@ -19,7 +19,7 @@ index c37a0f03..3bbf77a8 100644 + } } diff --git a/src/main/java/net/minecraft/server/MobSpawnerPatrol.java b/src/main/java/net/minecraft/server/MobSpawnerPatrol.java -index 33488b37..a0f58280 100644 +index 33488b37e4..a0f5828076 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 { @@ -31,5 +31,5 @@ index 33488b37..a0f58280 100644 return 0; } else if (!worldserver.getGameRules().getBoolean(GameRules.DO_PATROL_SPAWNING)) { -- -2.25.1.windows.1 +2.26.2 diff --git a/Spigot-Server-Patches/0408-Fix-AssertionError-when-player-hand-set-to-empty-typ.patch b/Spigot-Server-Patches/0408-Fix-AssertionError-when-player-hand-set-to-empty-typ.patch index 0fe0c7abdf..71e81292f5 100644 --- a/Spigot-Server-Patches/0408-Fix-AssertionError-when-player-hand-set-to-empty-typ.patch +++ b/Spigot-Server-Patches/0408-Fix-AssertionError-when-player-hand-set-to-empty-typ.patch @@ -1,4 +1,4 @@ -From e548c3e437a9d6a1dc445f9afd2b312b971ba9c8 Mon Sep 17 00:00:00 2001 +From b4de1c05b39bde78c5894d95c61392e084fcfb01 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 diff --git a/Spigot-Server-Patches/0409-PlayerLaunchProjectileEvent.patch b/Spigot-Server-Patches/0409-PlayerLaunchProjectileEvent.patch index 50a40421e9..9bb7fa31f0 100644 --- a/Spigot-Server-Patches/0409-PlayerLaunchProjectileEvent.patch +++ b/Spigot-Server-Patches/0409-PlayerLaunchProjectileEvent.patch @@ -1,11 +1,11 @@ -From 85109661ebc2568c3ba47350f014f0de559e4612 Mon Sep 17 00:00:00 2001 +From 99a6eecdaaf00be03a70e78de4a4f3b5cb54e97f 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 5cab47a2..886babdc 100644 +index 5cab47a282..886babdcda 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 5cab47a2..886babdc 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 6fccd70a..16f1b734 100644 +index 6fccd70a03..16f1b734e0 100644 --- a/src/main/java/net/minecraft/server/ItemEgg.java +++ b/src/main/java/net/minecraft/server/ItemEgg.java @@ -16,21 +16,35 @@ public class ItemEgg extends Item { @@ -61,7 +61,7 @@ index 6fccd70a..16f1b734 100644 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 cab869e8..b57e9f7e 100644 +index cab869e8e9..b57e9f7e72 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 { @@ -113,7 +113,7 @@ index cab869e8..b57e9f7e 100644 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 071688b3..1d575af5 100644 +index 071688b3ab..1d575af526 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 { @@ -158,7 +158,7 @@ index 071688b3..1d575af5 100644 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 c19b678c..7672e31f 100644 +index c19b678cfb..7672e31fc0 100644 --- a/src/main/java/net/minecraft/server/ItemLingeringPotion.java +++ b/src/main/java/net/minecraft/server/ItemLingeringPotion.java @@ -8,7 +8,11 @@ public class ItemLingeringPotion extends ItemPotionThrowable { @@ -176,7 +176,7 @@ index c19b678c..7672e31f 100644 } } diff --git a/src/main/java/net/minecraft/server/ItemPotionThrowable.java b/src/main/java/net/minecraft/server/ItemPotionThrowable.java -index 5d1f118c..d1beab1a 100644 +index 5d1f118c51..d1beab1ab7 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 { @@ -213,7 +213,7 @@ index 5d1f118c..d1beab1a 100644 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 56ec5089..e6044e65 100644 +index 56ec508959..e6044e654b 100644 --- a/src/main/java/net/minecraft/server/ItemSnowball.java +++ b/src/main/java/net/minecraft/server/ItemSnowball.java @@ -17,19 +17,27 @@ public class ItemSnowball extends Item { @@ -251,7 +251,7 @@ index 56ec5089..e6044e65 100644 /* if (!entityhuman.abilities.canInstantlyBuild) { diff --git a/src/main/java/net/minecraft/server/ItemSplashPotion.java b/src/main/java/net/minecraft/server/ItemSplashPotion.java -index 18bd846c..e71e933f 100644 +index 18bd846cee..e71e933fff 100644 --- a/src/main/java/net/minecraft/server/ItemSplashPotion.java +++ b/src/main/java/net/minecraft/server/ItemSplashPotion.java @@ -8,7 +8,11 @@ public class ItemSplashPotion extends ItemPotionThrowable { @@ -269,5 +269,5 @@ index 18bd846c..e71e933f 100644 } } -- -2.25.1.windows.1 +2.26.2 diff --git a/Spigot-Server-Patches/0410-Add-CraftMagicNumbers.isSupportedApiVersion.patch b/Spigot-Server-Patches/0410-Add-CraftMagicNumbers.isSupportedApiVersion.patch index 9e85c0f4a0..5aa3e2da18 100644 --- a/Spigot-Server-Patches/0410-Add-CraftMagicNumbers.isSupportedApiVersion.patch +++ b/Spigot-Server-Patches/0410-Add-CraftMagicNumbers.isSupportedApiVersion.patch @@ -1,11 +1,11 @@ -From 9e7d520c2f3409f7be318b7d57f67172c53d3b8d Mon Sep 17 00:00:00 2001 +From 9e4a9c0454c471fcaea876267f4f96d49ba222f2 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 b1e1b59d..770375ed 100644 +index b1e1b59d45..770375ed42 100644 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java @@ -308,6 +308,11 @@ public final class CraftMagicNumbers implements UnsafeValues { @@ -21,5 +21,5 @@ index b1e1b59d..770375ed 100644 /** -- -2.25.1.windows.1 +2.26.2 diff --git a/Spigot-Server-Patches/0411-Prevent-sync-chunk-loads-when-villagers-try-to-find-.patch b/Spigot-Server-Patches/0411-Prevent-sync-chunk-loads-when-villagers-try-to-find-.patch index 0fa4802c41..73f9a32343 100644 --- a/Spigot-Server-Patches/0411-Prevent-sync-chunk-loads-when-villagers-try-to-find-.patch +++ b/Spigot-Server-Patches/0411-Prevent-sync-chunk-loads-when-villagers-try-to-find-.patch @@ -1,11 +1,11 @@ -From 08357981b4601c9f9292514f7fe5307ddbbbc34a Mon Sep 17 00:00:00 2001 +From c30711cf8364170309721921a3dd340402cfcd6f 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 diff --git a/src/main/java/net/minecraft/server/BehaviorSleep.java b/src/main/java/net/minecraft/server/BehaviorSleep.java -index fa575dde..dfe0f665 100644 +index fa575dde19..dfe0f66500 100644 --- a/src/main/java/net/minecraft/server/BehaviorSleep.java +++ b/src/main/java/net/minecraft/server/BehaviorSleep.java @@ -31,7 +31,8 @@ public class BehaviorSleep extends Behavior { @@ -19,5 +19,5 @@ index fa575dde..dfe0f665 100644 return globalpos.getBlockPosition().a((IPosition) entityliving.getPositionVector(), 2.0D) && iblockdata.getBlock().a(TagsBlock.BEDS) && !(Boolean) iblockdata.get(BlockBed.OCCUPIED); } -- -2.25.1.windows.1 +2.26.2 diff --git a/Spigot-Server-Patches/0412-Fix-spawn-radius-being-treated-as-0.patch b/Spigot-Server-Patches/0412-Fix-spawn-radius-being-treated-as-0.patch index 068ae1d07f..4729115b5e 100644 --- a/Spigot-Server-Patches/0412-Fix-spawn-radius-being-treated-as-0.patch +++ b/Spigot-Server-Patches/0412-Fix-spawn-radius-being-treated-as-0.patch @@ -1,11 +1,11 @@ -From 63cd1ffc0e7c36baf0977d742eac3a5c96af0a90 Mon Sep 17 00:00:00 2001 +From f0c0011326491d419782bf793a7f2140185f4b14 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 987303e3..f23bf8ce 100644 +index bb10857cf3..b9d1747ab2 100644 --- a/src/main/java/net/minecraft/server/EntityPlayer.java +++ b/src/main/java/net/minecraft/server/EntityPlayer.java @@ -129,7 +129,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting { @@ -18,5 +18,5 @@ index 987303e3..f23bf8ce 100644 int j = MathHelper.floor(worldserver.getWorldBorder().b((double) blockposition.getX(), (double) blockposition.getZ())); -- -2.25.1.windows.1 +2.26.2 diff --git a/Spigot-Server-Patches/0413-MC-145656-Fix-Follow-Range-Initial-Target.patch b/Spigot-Server-Patches/0413-MC-145656-Fix-Follow-Range-Initial-Target.patch index ac25aab1f0..85fc6a9693 100644 --- a/Spigot-Server-Patches/0413-MC-145656-Fix-Follow-Range-Initial-Target.patch +++ b/Spigot-Server-Patches/0413-MC-145656-Fix-Follow-Range-Initial-Target.patch @@ -1,11 +1,11 @@ -From bc1304fba1e0192d58da8fb436b5623fe94e4e61 Mon Sep 17 00:00:00 2001 +From 47791f6612fb0b2cef0f8ed0d8879f4c202628cf 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 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index 3bbf77a8..f8d8cb86 100644 +index 3bbf77a8ec..f8d8cb8655 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java @@ -633,4 +633,9 @@ public class PaperWorldConfig { @@ -19,7 +19,7 @@ index 3bbf77a8..f8d8cb86 100644 + } } diff --git a/src/main/java/net/minecraft/server/PathfinderGoalNearestAttackableTarget.java b/src/main/java/net/minecraft/server/PathfinderGoalNearestAttackableTarget.java -index cd17bf2b..b85e67a8 100644 +index cd17bf2be5..b85e67a85d 100644 --- a/src/main/java/net/minecraft/server/PathfinderGoalNearestAttackableTarget.java +++ b/src/main/java/net/minecraft/server/PathfinderGoalNearestAttackableTarget.java @@ -25,6 +25,7 @@ public class PathfinderGoalNearestAttackableTarget exten @@ -31,7 +31,7 @@ index cd17bf2b..b85e67a8 100644 @Override diff --git a/src/main/java/net/minecraft/server/PathfinderTargetCondition.java b/src/main/java/net/minecraft/server/PathfinderTargetCondition.java -index c76a4383..e35ec2db 100644 +index c76a43837b..e35ec2db07 100644 --- a/src/main/java/net/minecraft/server/PathfinderTargetCondition.java +++ b/src/main/java/net/minecraft/server/PathfinderTargetCondition.java @@ -80,7 +80,7 @@ public class PathfinderTargetCondition { @@ -63,5 +63,5 @@ index c76a4383..e35ec2db 100644 + // Paper end } -- -2.25.1.windows.1 +2.26.2 diff --git a/Spigot-Server-Patches/0414-Optimize-Hoppers.patch b/Spigot-Server-Patches/0414-Optimize-Hoppers.patch index ddd1ff36b4..199d911110 100644 --- a/Spigot-Server-Patches/0414-Optimize-Hoppers.patch +++ b/Spigot-Server-Patches/0414-Optimize-Hoppers.patch @@ -1,4 +1,4 @@ -From 590aedc1bb3a7452d665965d965a1f4e41f53c9a Mon Sep 17 00:00:00 2001 +From dfaaff5f86e58598819bb62d004d6561ac6c58e9 Mon Sep 17 00:00:00 2001 From: Aikar Date: Wed, 27 Apr 2016 22:09:52 -0400 Subject: [PATCH] Optimize Hoppers diff --git a/Spigot-Server-Patches/0415-PlayerDeathEvent-shouldDropExperience.patch b/Spigot-Server-Patches/0415-PlayerDeathEvent-shouldDropExperience.patch index 52e3f3d09f..82682cc720 100644 --- a/Spigot-Server-Patches/0415-PlayerDeathEvent-shouldDropExperience.patch +++ b/Spigot-Server-Patches/0415-PlayerDeathEvent-shouldDropExperience.patch @@ -1,11 +1,11 @@ -From 5e96e206c4d525ade6786e7b85d7da4bbfbb8386 Mon Sep 17 00:00:00 2001 +From 4c5a72f2b7479ba24446c2504c6142b356b5d48d 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 f23bf8ce..24545b33 100644 +index b9d1747ab2..cf837bdb3b 100644 --- a/src/main/java/net/minecraft/server/EntityPlayer.java +++ b/src/main/java/net/minecraft/server/EntityPlayer.java @@ -645,7 +645,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting { @@ -18,5 +18,5 @@ index f23bf8ce..24545b33 100644 if (!event.getKeepInventory()) { // Paper start - replace logic -- -2.25.1.windows.1 +2.26.2 diff --git a/Spigot-Server-Patches/0416-Prevent-bees-loading-chunks-checking-hive-position.patch b/Spigot-Server-Patches/0416-Prevent-bees-loading-chunks-checking-hive-position.patch index 7a9c7ec42e..9d1fc7daaa 100644 --- a/Spigot-Server-Patches/0416-Prevent-bees-loading-chunks-checking-hive-position.patch +++ b/Spigot-Server-Patches/0416-Prevent-bees-loading-chunks-checking-hive-position.patch @@ -1,11 +1,11 @@ -From 3449a78c85b6c23884a62d4c55c9c0630992410c Mon Sep 17 00:00:00 2001 +From ec2d3d5de3a448e46148436c9b86308b2f434288 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 b3959965..73e01625 100644 +index b39599654e..73e0162578 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 b3959965..73e01625 100644 return tileentity != null && tileentity.getTileType() == TileEntityTypes.BEEHIVE; -- -2.25.1.windows.1 +2.26.2 diff --git a/Spigot-Server-Patches/0417-Don-t-load-Chunks-from-Hoppers-and-other-things.patch b/Spigot-Server-Patches/0417-Don-t-load-Chunks-from-Hoppers-and-other-things.patch index 8acd51e0c8..0cd84bc0fb 100644 --- a/Spigot-Server-Patches/0417-Don-t-load-Chunks-from-Hoppers-and-other-things.patch +++ b/Spigot-Server-Patches/0417-Don-t-load-Chunks-from-Hoppers-and-other-things.patch @@ -1,4 +1,4 @@ -From 9a4701440bf089d44c12d573f17872d8885396df Mon Sep 17 00:00:00 2001 +From 9b68068d44705a5e711840f1899ce2ae4007687a 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 @@ -13,7 +13,7 @@ This of course is undesirable, so just return the loaded side as "primary" and treat it as a single chest if the other sides are unloaded diff --git a/src/main/java/net/minecraft/server/DoubleBlockFinder.java b/src/main/java/net/minecraft/server/DoubleBlockFinder.java -index 3cb6e608..7a16a3e0 100644 +index 3cb6e60895..7a16a3e0e2 100644 --- a/src/main/java/net/minecraft/server/DoubleBlockFinder.java +++ b/src/main/java/net/minecraft/server/DoubleBlockFinder.java @@ -21,8 +21,12 @@ public class DoubleBlockFinder { @@ -32,5 +32,5 @@ index 3cb6e608..7a16a3e0 100644 DoubleBlockFinder.BlockType doubleblockfinder_blocktype1 = (DoubleBlockFinder.BlockType) function.apply(iblockdata1); -- -2.25.1.windows.1 +2.26.2 diff --git a/Spigot-Server-Patches/0418-Guard-against-serializing-mismatching-chunk-coordina.patch b/Spigot-Server-Patches/0418-Guard-against-serializing-mismatching-chunk-coordina.patch index d9e904986b..d7d94b7fa9 100644 --- a/Spigot-Server-Patches/0418-Guard-against-serializing-mismatching-chunk-coordina.patch +++ b/Spigot-Server-Patches/0418-Guard-against-serializing-mismatching-chunk-coordina.patch @@ -1,4 +1,4 @@ -From 5f3b4b82cea20de797b5bdd036b0644ed2ef7a82 Mon Sep 17 00:00:00 2001 +From bd2c97b4e2a476c2170825a496cc155b9380db25 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 @@ -6,7 +6,7 @@ Subject: [PATCH] Guard against serializing mismatching chunk coordinate Should help if something dumb happens diff --git a/src/main/java/net/minecraft/server/ChunkRegionLoader.java b/src/main/java/net/minecraft/server/ChunkRegionLoader.java -index 1298a07d..57a6e7c1 100644 +index 7389aba1a4..938c747dcc 100644 --- a/src/main/java/net/minecraft/server/ChunkRegionLoader.java +++ b/src/main/java/net/minecraft/server/ChunkRegionLoader.java @@ -23,6 +23,13 @@ public class ChunkRegionLoader { @@ -35,7 +35,7 @@ index 1298a07d..57a6e7c1 100644 if (!Objects.equals(chunkcoordintpair, chunkcoordintpair1)) { ChunkRegionLoader.LOGGER.error("Chunk file at {} is in the wrong location; relocating. (Expected {}, got {})", chunkcoordintpair, chunkcoordintpair, chunkcoordintpair1); diff --git a/src/main/java/net/minecraft/server/IChunkLoader.java b/src/main/java/net/minecraft/server/IChunkLoader.java -index 134c7606..25c8b131 100644 +index 134c76065b..25c8b131fe 100644 --- a/src/main/java/net/minecraft/server/IChunkLoader.java +++ b/src/main/java/net/minecraft/server/IChunkLoader.java @@ -106,6 +106,13 @@ public class IChunkLoader extends RegionFileCache implements AutoCloseable { @@ -53,5 +53,5 @@ index 134c7606..25c8b131 100644 if (this.c != null) { synchronized (this.persistentDataLock) { // Paper - Async chunk loading -- -2.25.1.windows.1 +2.26.2 diff --git a/Spigot-Server-Patches/0419-Optimise-IEntityAccess-getPlayerByUUID.patch b/Spigot-Server-Patches/0419-Optimise-IEntityAccess-getPlayerByUUID.patch index 236674e481..f895f14a50 100644 --- a/Spigot-Server-Patches/0419-Optimise-IEntityAccess-getPlayerByUUID.patch +++ b/Spigot-Server-Patches/0419-Optimise-IEntityAccess-getPlayerByUUID.patch @@ -1,4 +1,4 @@ -From 93f6d4bc8ce214be21ee318b7824bf04dd1af2b1 Mon Sep 17 00:00:00 2001 +From 7cd937068c4806c38ef0b721fe5029baf4932ac3 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 d5c284cd..4157e50e 100644 +index d5c284cdd1..4157e50e4d 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 d5c284cd..4157e50e 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 81590e47..71f5e3ce 100644 +index 06d693ca2c..62fabb7ad5 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 81590e47..71f5e3ce 100644 public final com.destroystokyo.paper.io.PaperFileIOThread.ChunkDataController poiDataController = new com.destroystokyo.paper.io.PaperFileIOThread.ChunkDataController() { @Override -- -2.25.1.windows.1 +2.26.2 diff --git a/Spigot-Server-Patches/0420-Fix-items-not-falling-correctly.patch b/Spigot-Server-Patches/0420-Fix-items-not-falling-correctly.patch index 6a6c3f925b..b85bcb00a5 100644 --- a/Spigot-Server-Patches/0420-Fix-items-not-falling-correctly.patch +++ b/Spigot-Server-Patches/0420-Fix-items-not-falling-correctly.patch @@ -1,4 +1,4 @@ -From dc0e3a343fb7cb36bb501364e9a65552ba2be5ac Mon Sep 17 00:00:00 2001 +From a5e48d88bee5596fbcbc2dc2d358f2b62b31fa27 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 @@ -15,7 +15,7 @@ This patch resolves the conflict by offsetting checking an item's move method from Spigot's entity activation range check. diff --git a/src/main/java/net/minecraft/server/EntityItem.java b/src/main/java/net/minecraft/server/EntityItem.java -index 507627a2..2926fbb9 100644 +index 507627a29f..2926fbb957 100644 --- a/src/main/java/net/minecraft/server/EntityItem.java +++ b/src/main/java/net/minecraft/server/EntityItem.java @@ -86,7 +86,7 @@ public class EntityItem extends Entity { @@ -28,5 +28,5 @@ index 507627a2..2926fbb9 100644 float f = 0.98F; -- -2.25.1.windows.1 +2.26.2 diff --git a/Spigot-Server-Patches/0421-Lag-compensate-eating.patch b/Spigot-Server-Patches/0421-Lag-compensate-eating.patch index 1f896ee0d4..5f0e8fad1e 100644 --- a/Spigot-Server-Patches/0421-Lag-compensate-eating.patch +++ b/Spigot-Server-Patches/0421-Lag-compensate-eating.patch @@ -1,4 +1,4 @@ -From 826d9e18cd1a733abb0f857568be89ab89bda212 Mon Sep 17 00:00:00 2001 +From 861a006e94de134f1c156428d5afde26df94f0e5 Mon Sep 17 00:00:00 2001 From: Spottedleaf Date: Tue, 14 Jan 2020 15:28:28 -0800 Subject: [PATCH] Lag compensate eating diff --git a/Spigot-Server-Patches/0422-Optimize-call-to-getFluid-for-explosions.patch b/Spigot-Server-Patches/0422-Optimize-call-to-getFluid-for-explosions.patch index 6738808501..d8eb101450 100644 --- a/Spigot-Server-Patches/0422-Optimize-call-to-getFluid-for-explosions.patch +++ b/Spigot-Server-Patches/0422-Optimize-call-to-getFluid-for-explosions.patch @@ -1,11 +1,11 @@ -From 09de5f6181db4f021d6754ae297210b3f13c46e9 Mon Sep 17 00:00:00 2001 +From 3a804ad8fa753b51411862f74a8224b27526b286 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 diff --git a/src/main/java/net/minecraft/server/Explosion.java b/src/main/java/net/minecraft/server/Explosion.java -index d99d2def..a353f3d5 100644 +index d99d2defe9..a353f3d5fa 100644 --- a/src/main/java/net/minecraft/server/Explosion.java +++ b/src/main/java/net/minecraft/server/Explosion.java @@ -117,7 +117,7 @@ public class Explosion { @@ -18,5 +18,5 @@ index d99d2def..a353f3d5 100644 if (!iblockdata.isAir() || !fluid.isEmpty()) { float f2 = Math.max(iblockdata.getBlock().getDurability(), fluid.k()); -- -2.25.1.windows.1 +2.26.2 diff --git a/Spigot-Server-Patches/0423-Fix-last-firework-in-stack-not-having-effects-when-d.patch b/Spigot-Server-Patches/0423-Fix-last-firework-in-stack-not-having-effects-when-d.patch index 2c4557c9ea..d4bcb3e851 100644 --- a/Spigot-Server-Patches/0423-Fix-last-firework-in-stack-not-having-effects-when-d.patch +++ b/Spigot-Server-Patches/0423-Fix-last-firework-in-stack-not-having-effects-when-d.patch @@ -1,4 +1,4 @@ -From cd6a7bb9f3d55caa170f683532f86b534176c9af Mon Sep 17 00:00:00 2001 +From b967c96d5eaaf93c2d021e544619fad69145d61f 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 @@ -9,7 +9,7 @@ dispensed. The resulting item would have size == 0 and therefore be convertered to air, hence why the effects disappeared. diff --git a/src/main/java/net/minecraft/server/IDispenseBehavior.java b/src/main/java/net/minecraft/server/IDispenseBehavior.java -index b6b7e3c6..3af686c7 100644 +index b6b7e3c6c9..3af686c7f1 100644 --- a/src/main/java/net/minecraft/server/IDispenseBehavior.java +++ b/src/main/java/net/minecraft/server/IDispenseBehavior.java @@ -265,7 +265,7 @@ public interface IDispenseBehavior { @@ -22,5 +22,5 @@ index b6b7e3c6..3af686c7 100644 entityfireworks.shoot(d0, d1, d2, 0.5F, 1.0F); isourceblock.getWorld().addEntity(entityfireworks); -- -2.25.1.windows.1 +2.26.2 diff --git a/Spigot-Server-Patches/0424-Entity-Activation-Range-2.0.patch b/Spigot-Server-Patches/0424-Entity-Activation-Range-2.0.patch index c3523f0c67..9554dfde8c 100644 --- a/Spigot-Server-Patches/0424-Entity-Activation-Range-2.0.patch +++ b/Spigot-Server-Patches/0424-Entity-Activation-Range-2.0.patch @@ -1,4 +1,4 @@ -From c7b8160386ce4c05a0be9779d2af9c9426287626 Mon Sep 17 00:00:00 2001 +From 56c60b5fe7223fdb70332e205f3ae0a831377782 Mon Sep 17 00:00:00 2001 From: Aikar Date: Fri, 13 May 2016 01:38:06 -0400 Subject: [PATCH] Entity Activation Range 2.0 diff --git a/Spigot-Server-Patches/0425-Add-effect-to-block-break-naturally.patch b/Spigot-Server-Patches/0425-Add-effect-to-block-break-naturally.patch index e5298db95e..c996e5304a 100644 --- a/Spigot-Server-Patches/0425-Add-effect-to-block-break-naturally.patch +++ b/Spigot-Server-Patches/0425-Add-effect-to-block-break-naturally.patch @@ -1,4 +1,4 @@ -From 28e6d914ef8c376893cb688b53707f1999aabc2a Mon Sep 17 00:00:00 2001 +From a7cd7cc5a51a79febd66af4ce2a213cae72bbeea 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 diff --git a/Spigot-Server-Patches/0426-Tracking-Range-Improvements.patch b/Spigot-Server-Patches/0426-Tracking-Range-Improvements.patch index 8e2cf478b6..cfccb86367 100644 --- a/Spigot-Server-Patches/0426-Tracking-Range-Improvements.patch +++ b/Spigot-Server-Patches/0426-Tracking-Range-Improvements.patch @@ -1,4 +1,4 @@ -From d4b743b1eb3dc8719e37aa97dd4f7173a6e9e92d Mon Sep 17 00:00:00 2001 +From 053029c773639ce909274257536171299e07e9bc Mon Sep 17 00:00:00 2001 From: kickash32 Date: Sat, 21 Dec 2019 15:22:09 -0500 Subject: [PATCH] Tracking Range Improvements diff --git a/Spigot-Server-Patches/0427-Fix-comparator-behavior-for-EntityPhanton-goal.patch b/Spigot-Server-Patches/0427-Fix-comparator-behavior-for-EntityPhanton-goal.patch index 95ad9f052a..0bd578c3e0 100644 --- a/Spigot-Server-Patches/0427-Fix-comparator-behavior-for-EntityPhanton-goal.patch +++ b/Spigot-Server-Patches/0427-Fix-comparator-behavior-for-EntityPhanton-goal.patch @@ -1,11 +1,11 @@ -From c569fed0197bce36d4de945e5e4a3b6f257dd520 Mon Sep 17 00:00:00 2001 +From 6400c06a994b01d69a401a0b73e718a000200ef3 Mon Sep 17 00:00:00 2001 From: Shane Freeder Date: Wed, 22 Jan 2020 21:00:21 +0000 Subject: [PATCH] Fix comparator behavior for EntityPhanton goal diff --git a/src/main/java/net/minecraft/server/EntityPhantom.java b/src/main/java/net/minecraft/server/EntityPhantom.java -index 82323bf4..90eeddb1 100644 +index 82323bf4ac..90eeddb1af 100644 --- a/src/main/java/net/minecraft/server/EntityPhantom.java +++ b/src/main/java/net/minecraft/server/EntityPhantom.java @@ -224,7 +224,7 @@ public class EntityPhantom extends EntityFlying implements IMonster { @@ -18,5 +18,5 @@ index 82323bf4..90eeddb1 100644 Iterator iterator = list.iterator(); -- -2.25.1.windows.1 +2.26.2 diff --git a/Spigot-Server-Patches/0428-Fix-items-vanishing-through-end-portal.patch b/Spigot-Server-Patches/0428-Fix-items-vanishing-through-end-portal.patch index 5333a4cc01..166bc18328 100644 --- a/Spigot-Server-Patches/0428-Fix-items-vanishing-through-end-portal.patch +++ b/Spigot-Server-Patches/0428-Fix-items-vanishing-through-end-portal.patch @@ -1,4 +1,4 @@ -From 3a9f340f20027f97f530da2ec018d02dbd8d6af7 Mon Sep 17 00:00:00 2001 +From 9f8127daa87474a4d38be257abc1252430f0f718 Mon Sep 17 00:00:00 2001 From: AJMFactsheets Date: Wed, 22 Jan 2020 19:52:28 -0600 Subject: [PATCH] Fix items vanishing through end portal @@ -13,7 +13,7 @@ Quickly loading the exact world spawn chunk before searching the heightmap resolves the issue without having to load all spawn chunks. diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java -index 6509463e..a3306c6b 100644 +index 067420f195..599bcabd14 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java @@ -2611,6 +2611,11 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke @@ -29,5 +29,5 @@ index 6509463e..a3306c6b 100644 EntityPortalEvent event = CraftEventFactory.callEntityPortalEvent(this, worldserver1, worldserver1.getHighestBlockYAt(HeightMap.Type.MOTION_BLOCKING_NO_LEAVES, worldserver1.getSpawn()), 0); if (event == null) { -- -2.25.1.windows.1 +2.26.2 diff --git a/Spigot-Server-Patches/0429-Seed-based-feature-search.patch b/Spigot-Server-Patches/0429-Seed-based-feature-search.patch index e24ca0e888..4082aea7dd 100644 --- a/Spigot-Server-Patches/0429-Seed-based-feature-search.patch +++ b/Spigot-Server-Patches/0429-Seed-based-feature-search.patch @@ -1,4 +1,4 @@ -From 901d05219b3afd04387f9ebd254faf38c75ad532 Mon Sep 17 00:00:00 2001 +From 0ff0fcc356722ec20778632a874e8ada0d934335 Mon Sep 17 00:00:00 2001 From: Phoenix616 Date: Mon, 13 Jan 2020 15:40:32 +0100 Subject: [PATCH] Seed based feature search diff --git a/Spigot-Server-Patches/0430-Bees-get-gravity-in-void.-Fixes-MC-167279.patch b/Spigot-Server-Patches/0430-Bees-get-gravity-in-void.-Fixes-MC-167279.patch index 9705eae1bf..8a77c95398 100644 --- a/Spigot-Server-Patches/0430-Bees-get-gravity-in-void.-Fixes-MC-167279.patch +++ b/Spigot-Server-Patches/0430-Bees-get-gravity-in-void.-Fixes-MC-167279.patch @@ -1,11 +1,11 @@ -From 8150fb3b05f49c5a58499854934147edad3504b6 Mon Sep 17 00:00:00 2001 +From d86f5b06729e26846af2f19d5a38d7b33da26f53 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Sun, 26 Jan 2020 16:30:19 -0600 Subject: [PATCH] Bees get gravity in void. Fixes MC-167279 diff --git a/src/main/java/net/minecraft/server/ControllerMove.java b/src/main/java/net/minecraft/server/ControllerMove.java -index 7e3671da..a5c4cbb6 100644 +index 7e3671dae6..a5c4cbb67f 100644 --- a/src/main/java/net/minecraft/server/ControllerMove.java +++ b/src/main/java/net/minecraft/server/ControllerMove.java @@ -2,7 +2,7 @@ package net.minecraft.server; @@ -18,7 +18,7 @@ index 7e3671da..a5c4cbb6 100644 protected double c; protected double d; diff --git a/src/main/java/net/minecraft/server/ControllerMoveFlying.java b/src/main/java/net/minecraft/server/ControllerMoveFlying.java -index 2b6ac2ee..0496c0c5 100644 +index 2b6ac2eeb0..0496c0c5db 100644 --- a/src/main/java/net/minecraft/server/ControllerMoveFlying.java +++ b/src/main/java/net/minecraft/server/ControllerMoveFlying.java @@ -12,7 +12,7 @@ public class ControllerMoveFlying extends ControllerMove { @@ -31,7 +31,7 @@ index 2b6ac2ee..0496c0c5 100644 this.h = ControllerMove.Operation.WAIT; this.a.setNoGravity(true); diff --git a/src/main/java/net/minecraft/server/EntityBee.java b/src/main/java/net/minecraft/server/EntityBee.java -index 73e01625..c7d79efd 100644 +index 73e0162578..c7d79efdf6 100644 --- a/src/main/java/net/minecraft/server/EntityBee.java +++ b/src/main/java/net/minecraft/server/EntityBee.java @@ -36,7 +36,17 @@ public class EntityBee extends EntityAnimal implements EntityBird { @@ -54,5 +54,5 @@ index 73e01625..c7d79efd 100644 this.a(PathType.WATER, -1.0F); this.a(PathType.COCOA, -1.0F); -- -2.25.1.windows.1 +2.26.2 diff --git a/Spigot-Server-Patches/0431-Optimise-getChunkAt-calls-for-loaded-chunks.patch b/Spigot-Server-Patches/0431-Optimise-getChunkAt-calls-for-loaded-chunks.patch index 12f4f5fdbb..05866278bd 100644 --- a/Spigot-Server-Patches/0431-Optimise-getChunkAt-calls-for-loaded-chunks.patch +++ b/Spigot-Server-Patches/0431-Optimise-getChunkAt-calls-for-loaded-chunks.patch @@ -1,4 +1,4 @@ -From b9f9bfb94e246b7f483cb6bdaade26a72ad42c81 Mon Sep 17 00:00:00 2001 +From ecae8caf37165aba7f2ac5f12f41a882079878da Mon Sep 17 00:00:00 2001 From: Spottedleaf Date: Sat, 25 Jan 2020 17:04:35 -0800 Subject: [PATCH] Optimise getChunkAt calls for loaded chunks diff --git a/Spigot-Server-Patches/0432-Be-more-tolerant-of-invalid-attributes.patch b/Spigot-Server-Patches/0432-Be-more-tolerant-of-invalid-attributes.patch index f953f5767a..c573c68f22 100644 --- a/Spigot-Server-Patches/0432-Be-more-tolerant-of-invalid-attributes.patch +++ b/Spigot-Server-Patches/0432-Be-more-tolerant-of-invalid-attributes.patch @@ -1,4 +1,4 @@ -From 76ace9408e72934e0ae49e971ef1158721951a22 Mon Sep 17 00:00:00 2001 +From 2a21cc0e0e438f74c2e58c21e3795061a1dd17bd Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Thu, 6 Feb 2020 19:20:27 -0600 Subject: [PATCH] Be more tolerant of invalid attributes @@ -11,7 +11,7 @@ In a more perfect world the API would expose some way to interact with these att particularly flexible in this area. Perhaps this is an area for future expansion at a later time. diff --git a/src/main/java/org/bukkit/craftbukkit/attribute/CraftAttributeMap.java b/src/main/java/org/bukkit/craftbukkit/attribute/CraftAttributeMap.java -index 77e584b1..007d28b1 100644 +index 77e584b129..007d28b16c 100644 --- a/src/main/java/org/bukkit/craftbukkit/attribute/CraftAttributeMap.java +++ b/src/main/java/org/bukkit/craftbukkit/attribute/CraftAttributeMap.java @@ -47,6 +47,12 @@ public class CraftAttributeMap implements Attributable { @@ -28,5 +28,5 @@ index 77e584b1..007d28b1 100644 String descriptor = CaseFormat.LOWER_CAMEL.to(CaseFormat.UPPER_UNDERSCORE, split[1]); // movementSpeed -> MOVEMENT_SPEED String fin = generic + "_" + descriptor; -- -2.25.1.windows.1 +2.26.2 diff --git a/Spigot-Server-Patches/0433-Allow-overriding-the-java-version-check.patch b/Spigot-Server-Patches/0433-Allow-overriding-the-java-version-check.patch index 2152a39d2d..61e9905bb5 100644 --- a/Spigot-Server-Patches/0433-Allow-overriding-the-java-version-check.patch +++ b/Spigot-Server-Patches/0433-Allow-overriding-the-java-version-check.patch @@ -1,4 +1,4 @@ -From 67717b1bdfa1cbbb39537fd7ff15ae9e9863cf75 Mon Sep 17 00:00:00 2001 +From fcbfa3c706dbd6e026210aeae63e189a4aa0236f Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Sat, 8 Feb 2020 18:02:24 -0600 Subject: [PATCH] Allow overriding the java version check @@ -6,7 +6,7 @@ Subject: [PATCH] Allow overriding the java version check -DPaper.IgnoreJavaVersion=true diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java -index 444a6a60..cb60310e 100644 +index bf0a020189..093dbeae27 100644 --- a/src/main/java/org/bukkit/craftbukkit/Main.java +++ b/src/main/java/org/bukkit/craftbukkit/Main.java @@ -175,7 +175,7 @@ public class Main { @@ -19,5 +19,5 @@ index 444a6a60..cb60310e 100644 try { -- -2.25.1.windows.1 +2.26.2 diff --git a/Spigot-Server-Patches/0434-Add-ThrownEggHatchEvent.patch b/Spigot-Server-Patches/0434-Add-ThrownEggHatchEvent.patch index fc68e5b814..6ddd8215d0 100644 --- a/Spigot-Server-Patches/0434-Add-ThrownEggHatchEvent.patch +++ b/Spigot-Server-Patches/0434-Add-ThrownEggHatchEvent.patch @@ -1,4 +1,4 @@ -From 9d7585cda7f97d6d1864c7676e44017fdf673849 Mon Sep 17 00:00:00 2001 +From 50bb85d3fc3124e08daa13774417051f4e3667ba Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Sun, 9 Feb 2020 00:19:05 -0600 Subject: [PATCH] Add ThrownEggHatchEvent @@ -7,7 +7,7 @@ Adds a new event similar to PlayerEggThrowEvent, but without the Player requirem (dispensers can throw eggs to hatch them, too). diff --git a/src/main/java/net/minecraft/server/EntityEgg.java b/src/main/java/net/minecraft/server/EntityEgg.java -index 970f9109..bdd82d05 100644 +index 970f9109d9..bdd82d052a 100644 --- a/src/main/java/net/minecraft/server/EntityEgg.java +++ b/src/main/java/net/minecraft/server/EntityEgg.java @@ -52,6 +52,16 @@ public class EntityEgg extends EntityProjectileThrowable { @@ -28,5 +28,5 @@ index 970f9109..bdd82d05 100644 for (int i = 0; i < b0; ++i) { Entity entity = world.getWorld().createEntity(new org.bukkit.Location(world.getWorld(), this.locX(), this.locY(), this.locZ(), this.yaw, 0.0F), hatchingType.getEntityClass()); -- -2.25.1.windows.1 +2.26.2 diff --git a/Spigot-Server-Patches/0435-Optimise-random-block-ticking.patch b/Spigot-Server-Patches/0435-Optimise-random-block-ticking.patch index d58059e15a..d26b618c2a 100644 --- a/Spigot-Server-Patches/0435-Optimise-random-block-ticking.patch +++ b/Spigot-Server-Patches/0435-Optimise-random-block-ticking.patch @@ -1,4 +1,4 @@ -From 02f32cef330de0f4b4bb4367e12181195b1aa14f Mon Sep 17 00:00:00 2001 +From 18fb4717649f3e45bf2e92c2498acef2b185cff2 Mon Sep 17 00:00:00 2001 From: Spottedleaf Date: Mon, 27 Jan 2020 21:28:00 -0800 Subject: [PATCH] Optimise random block ticking diff --git a/Spigot-Server-Patches/0436-Entity-Jump-API.patch b/Spigot-Server-Patches/0436-Entity-Jump-API.patch index c634c5faf8..706ace3f29 100644 --- a/Spigot-Server-Patches/0436-Entity-Jump-API.patch +++ b/Spigot-Server-Patches/0436-Entity-Jump-API.patch @@ -1,4 +1,4 @@ -From 09b2d710c63fb8d1af641e7cac1eb4bb9d44c301 Mon Sep 17 00:00:00 2001 +From 0dde405e740b34c0138f6905d8855e32199264f7 Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Sat, 8 Feb 2020 23:26:11 -0600 Subject: [PATCH] Entity Jump API diff --git a/Spigot-Server-Patches/0437-Add-option-to-nerf-pigmen-from-nether-portals.patch b/Spigot-Server-Patches/0437-Add-option-to-nerf-pigmen-from-nether-portals.patch index 6f137c8af5..e4cbe1c21c 100644 --- a/Spigot-Server-Patches/0437-Add-option-to-nerf-pigmen-from-nether-portals.patch +++ b/Spigot-Server-Patches/0437-Add-option-to-nerf-pigmen-from-nether-portals.patch @@ -1,11 +1,11 @@ -From aa70337f4df45eb5d3d89286423c5e5ee73ba431 Mon Sep 17 00:00:00 2001 +From 1801e9752d6966f08a71b51e05ab6c491b48d82b Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Fri, 7 Feb 2020 14:36:56 -0600 Subject: [PATCH] Add option to nerf pigmen from nether portals diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index bce50218..7d408542 100644 +index bce502181f..7d408542e7 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java @@ -653,4 +653,9 @@ public class PaperWorldConfig { @@ -19,7 +19,7 @@ index bce50218..7d408542 100644 + } } diff --git a/src/main/java/net/minecraft/server/BlockPortal.java b/src/main/java/net/minecraft/server/BlockPortal.java -index 2dc3ab4c..09c7c131 100644 +index 2dc3ab4cfa..09c7c13183 100644 --- a/src/main/java/net/minecraft/server/BlockPortal.java +++ b/src/main/java/net/minecraft/server/BlockPortal.java @@ -45,6 +45,8 @@ public class BlockPortal extends Block { @@ -32,7 +32,7 @@ index 2dc3ab4c..09c7c131 100644 } } diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java -index a3306c6b..16f2e32d 100644 +index 599bcabd14..00df89d650 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java @@ -194,6 +194,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke @@ -62,5 +62,5 @@ index a3306c6b..16f2e32d 100644 String spawnReasonName = nbttagcompound.getString("Paper.SpawnReason"); try { -- -2.25.1.windows.1 +2.26.2 diff --git a/Spigot-Server-Patches/0438-Make-the-GUI-graph-fancier.patch b/Spigot-Server-Patches/0438-Make-the-GUI-graph-fancier.patch index 243c8e9b34..d131e01884 100644 --- a/Spigot-Server-Patches/0438-Make-the-GUI-graph-fancier.patch +++ b/Spigot-Server-Patches/0438-Make-the-GUI-graph-fancier.patch @@ -1,4 +1,4 @@ -From ee80ba57aa40c97851ea1e40c05b6890da64b8ca Mon Sep 17 00:00:00 2001 +From 4cc59ca1b2c243beb92b676275d659770c5051ae Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Sun, 2 Feb 2020 04:00:40 -0600 Subject: [PATCH] Make the GUI graph fancier @@ -6,7 +6,7 @@ Subject: [PATCH] Make the GUI graph fancier diff --git a/src/main/java/com/destroystokyo/paper/gui/GraphColor.java b/src/main/java/com/destroystokyo/paper/gui/GraphColor.java new file mode 100644 -index 00000000..a4e641fd +index 0000000000..a4e641fdcc --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/gui/GraphColor.java @@ -0,0 +1,44 @@ @@ -56,7 +56,7 @@ index 00000000..a4e641fd +} diff --git a/src/main/java/com/destroystokyo/paper/gui/GraphData.java b/src/main/java/com/destroystokyo/paper/gui/GraphData.java new file mode 100644 -index 00000000..186fc722 +index 0000000000..186fc72296 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/gui/GraphData.java @@ -0,0 +1,47 @@ @@ -109,7 +109,7 @@ index 00000000..186fc722 +} diff --git a/src/main/java/com/destroystokyo/paper/gui/GuiStatsComponent.java b/src/main/java/com/destroystokyo/paper/gui/GuiStatsComponent.java new file mode 100644 -index 00000000..0f29ad58 +index 0000000000..0f29ad583e --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/gui/GuiStatsComponent.java @@ -0,0 +1,41 @@ @@ -156,7 +156,7 @@ index 00000000..0f29ad58 +} diff --git a/src/main/java/com/destroystokyo/paper/gui/RAMDetails.java b/src/main/java/com/destroystokyo/paper/gui/RAMDetails.java new file mode 100644 -index 00000000..e463a86a +index 0000000000..e463a86a6a --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/gui/RAMDetails.java @@ -0,0 +1,74 @@ @@ -236,7 +236,7 @@ index 00000000..e463a86a +} diff --git a/src/main/java/com/destroystokyo/paper/gui/RAMGraph.java b/src/main/java/com/destroystokyo/paper/gui/RAMGraph.java new file mode 100644 -index 00000000..c3e54da4 +index 0000000000..c3e54da4ab --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/gui/RAMGraph.java @@ -0,0 +1,144 @@ @@ -385,7 +385,7 @@ index 00000000..c3e54da4 + } +} diff --git a/src/main/java/net/minecraft/server/GuiStatsComponent.java b/src/main/java/net/minecraft/server/GuiStatsComponent.java -index c21db8e6..7b6e9352 100644 +index c21db8e6b7..7b6e935257 100644 --- a/src/main/java/net/minecraft/server/GuiStatsComponent.java +++ b/src/main/java/net/minecraft/server/GuiStatsComponent.java @@ -12,7 +12,7 @@ import javax.swing.Timer; @@ -398,7 +398,7 @@ index c21db8e6..7b6e9352 100644 }); private final int[] b = new int[256]; diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 177d1445..ec9ff06c 100644 +index 63db74993c..d1f82eff21 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -105,7 +105,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant Date: Fri, 21 Feb 2020 18:44:28 +0000 Subject: [PATCH] Backport fix for MC-167561 diff --git a/src/main/java/net/minecraft/server/EntityWolf.java b/src/main/java/net/minecraft/server/EntityWolf.java -index db15d5e0..eec1e26b 100644 +index db15d5e0a2..eec1e26b6e 100644 --- a/src/main/java/net/minecraft/server/EntityWolf.java +++ b/src/main/java/net/minecraft/server/EntityWolf.java @@ -296,7 +296,14 @@ public class EntityWolf extends EntityTameableAnimal { @@ -40,5 +40,5 @@ index db15d5e0..eec1e26b 100644 if (!entityhuman.abilities.canInstantlyBuild) { itemstack.subtract(1); -- -2.25.1.windows.1 +2.26.2 diff --git a/Spigot-Server-Patches/0440-add-hand-to-BlockMultiPlaceEvent.patch b/Spigot-Server-Patches/0440-add-hand-to-BlockMultiPlaceEvent.patch index ab807ef92c..b040ed0ba9 100644 --- a/Spigot-Server-Patches/0440-add-hand-to-BlockMultiPlaceEvent.patch +++ b/Spigot-Server-Patches/0440-add-hand-to-BlockMultiPlaceEvent.patch @@ -1,14 +1,14 @@ -From dedd1909c8d203d6442f0f3f08fe8b33a1ae4786 Mon Sep 17 00:00:00 2001 +From 8a2660468466486b4fe5fb1107be67204f4d6699 Mon Sep 17 00:00:00 2001 From: Trigary Date: Sun, 1 Mar 2020 22:43:24 +0100 Subject: [PATCH] add hand to BlockMultiPlaceEvent diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -index 39ce40bd..1f5d15bb 100644 +index fcf2b190aa..c3f7e46121 100644 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -@@ -296,13 +296,18 @@ public class CraftEventFactory { +@@ -303,13 +303,18 @@ public class CraftEventFactory { } org.bukkit.inventory.ItemStack item; @@ -29,5 +29,5 @@ index 39ce40bd..1f5d15bb 100644 return event; -- -2.25.1.windows.1 +2.26.2 diff --git a/Spigot-Server-Patches/0441-Prevent-teleporting-dead-entities.patch b/Spigot-Server-Patches/0441-Prevent-teleporting-dead-entities.patch index 621fbc232a..1a7e44a6ec 100644 --- a/Spigot-Server-Patches/0441-Prevent-teleporting-dead-entities.patch +++ b/Spigot-Server-Patches/0441-Prevent-teleporting-dead-entities.patch @@ -1,11 +1,11 @@ -From a9b16689599113662a9e5bf20f6d89c053983170 Mon Sep 17 00:00:00 2001 +From 4d4e8a911ceec51125642a93a5351383e643c3d3 Mon Sep 17 00:00:00 2001 From: Shane Freeder Date: Tue, 3 Mar 2020 05:26:40 +0000 Subject: [PATCH] Prevent teleporting dead entities diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java -index 108377d7..7929fcc8 100644 +index 71d045ee00..2e81f3a1d9 100644 --- a/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java @@ -1209,6 +1209,10 @@ public class PlayerConnection implements PacketListenerPlayIn { @@ -20,5 +20,5 @@ index 108377d7..7929fcc8 100644 if (Float.isNaN(f)) { f = 0; -- -2.25.1.windows.1 +2.26.2 diff --git a/Spigot-Server-Patches/0442-Validate-tripwire-hook-placement-before-update.patch b/Spigot-Server-Patches/0442-Validate-tripwire-hook-placement-before-update.patch index 4ebae9945d..b81e301577 100644 --- a/Spigot-Server-Patches/0442-Validate-tripwire-hook-placement-before-update.patch +++ b/Spigot-Server-Patches/0442-Validate-tripwire-hook-placement-before-update.patch @@ -1,11 +1,11 @@ -From d85ad68e211d87fbbc9aecb17ceb55341d3bad82 Mon Sep 17 00:00:00 2001 +From e31f4bc14529a7ac69abb42ad60aacc51d879221 Mon Sep 17 00:00:00 2001 From: Shane Freeder Date: Sat, 7 Mar 2020 00:07:51 +0000 Subject: [PATCH] Validate tripwire hook placement before update diff --git a/src/main/java/net/minecraft/server/BlockTripwireHook.java b/src/main/java/net/minecraft/server/BlockTripwireHook.java -index 1b9d889a..a5e6e94f 100644 +index 1b9d889af6..a5e6e94fe0 100644 --- a/src/main/java/net/minecraft/server/BlockTripwireHook.java +++ b/src/main/java/net/minecraft/server/BlockTripwireHook.java @@ -149,6 +149,7 @@ public class BlockTripwireHook extends Block { @@ -17,5 +17,5 @@ index 1b9d889a..a5e6e94f 100644 if (flag1) { this.a(world, blockposition, enumdirection); -- -2.25.1.windows.1 +2.26.2 diff --git a/Spigot-Server-Patches/0443-Add-option-to-allow-iron-golems-to-spawn-in-air.patch b/Spigot-Server-Patches/0443-Add-option-to-allow-iron-golems-to-spawn-in-air.patch index 182bd539c5..129d63a4f3 100644 --- a/Spigot-Server-Patches/0443-Add-option-to-allow-iron-golems-to-spawn-in-air.patch +++ b/Spigot-Server-Patches/0443-Add-option-to-allow-iron-golems-to-spawn-in-air.patch @@ -1,11 +1,11 @@ -From ffba493d6c7cd9235d9749abf214037096fda6f6 Mon Sep 17 00:00:00 2001 +From fd386fcfe4a32bb728ea791ccb60da1a057a9a32 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Sat, 13 Apr 2019 16:50:58 -0500 Subject: [PATCH] Add option to allow iron golems to spawn in air diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index 7d408542..c7cde1d0 100644 +index 7d408542e7..c7cde1d0a0 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java @@ -415,6 +415,11 @@ public class PaperWorldConfig { @@ -21,7 +21,7 @@ index 7d408542..c7cde1d0 100644 private void bedSearchRadius() { bedSearchRadius = getInt("bed-search-radius", 1); diff --git a/src/main/java/net/minecraft/server/EntityIronGolem.java b/src/main/java/net/minecraft/server/EntityIronGolem.java -index 2f764776..7f6a5677 100644 +index 2f764776b2..7f6a567760 100644 --- a/src/main/java/net/minecraft/server/EntityIronGolem.java +++ b/src/main/java/net/minecraft/server/EntityIronGolem.java @@ -221,7 +221,7 @@ public class EntityIronGolem extends EntityGolem { @@ -34,5 +34,5 @@ index 2f764776..7f6a5677 100644 } else { for (int i = 1; i < 3; ++i) { -- -2.25.1.windows.1 +2.26.2 diff --git a/Spigot-Server-Patches/0444-Configurable-chance-of-villager-zombie-infection.patch b/Spigot-Server-Patches/0444-Configurable-chance-of-villager-zombie-infection.patch index 8e80a4f9ff..748e79b138 100644 --- a/Spigot-Server-Patches/0444-Configurable-chance-of-villager-zombie-infection.patch +++ b/Spigot-Server-Patches/0444-Configurable-chance-of-villager-zombie-infection.patch @@ -1,4 +1,4 @@ -From cb5c1174aa81400a622241a1238181de58c263f9 Mon Sep 17 00:00:00 2001 +From 5dcb48861ffd63739b53bc714b86715494be1a79 Mon Sep 17 00:00:00 2001 From: Zero Date: Sat, 22 Feb 2020 16:10:31 -0500 Subject: [PATCH] Configurable chance of villager zombie infection @@ -8,7 +8,7 @@ This allows you to solve an issue in vanilla behavior where: * On normal difficulty they will have a 50% of getting infected or dying. diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index c7cde1d0..7ca67a4a 100644 +index c7cde1d0a0..7ca67a4aa5 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java @@ -663,4 +663,9 @@ public class PaperWorldConfig { @@ -22,7 +22,7 @@ index c7cde1d0..7ca67a4a 100644 + } } diff --git a/src/main/java/net/minecraft/server/EntityZombie.java b/src/main/java/net/minecraft/server/EntityZombie.java -index 8635d4f4..07ebc1d8 100644 +index 8635d4f40c..07ebc1d816 100644 --- a/src/main/java/net/minecraft/server/EntityZombie.java +++ b/src/main/java/net/minecraft/server/EntityZombie.java @@ -455,10 +455,14 @@ public class EntityZombie extends EntityMonster { @@ -44,5 +44,5 @@ index 8635d4f4..07ebc1d8 100644 EntityVillager entityvillager = (EntityVillager) entityliving; EntityZombieVillager entityzombievillager = (EntityZombieVillager) EntityTypes.ZOMBIE_VILLAGER.a(this.world); -- -2.25.1.windows.1 +2.26.2 diff --git a/Spigot-Server-Patches/0445-Optimise-Chunk-getFluid.patch b/Spigot-Server-Patches/0445-Optimise-Chunk-getFluid.patch index 8f58ae8966..368ee81720 100644 --- a/Spigot-Server-Patches/0445-Optimise-Chunk-getFluid.patch +++ b/Spigot-Server-Patches/0445-Optimise-Chunk-getFluid.patch @@ -1,4 +1,4 @@ -From 0db5cf9de4d36d8d583b66f58a63c952e2c3df43 Mon Sep 17 00:00:00 2001 +From f0bf987e53c7aa744047a0cd70b3b506897a7998 Mon Sep 17 00:00:00 2001 From: Spottedleaf Date: Tue, 14 Jan 2020 14:59:08 -0800 Subject: [PATCH] Optimise Chunk#getFluid @@ -8,7 +8,7 @@ faster on its own, however removing the try catch makes it easier to inline due to code size diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java -index 8fc26aa4b8..8695845445 100644 +index 2e3db1a755..d802acef71 100644 --- a/src/main/java/net/minecraft/server/Chunk.java +++ b/src/main/java/net/minecraft/server/Chunk.java @@ -365,17 +365,20 @@ public class Chunk implements IChunkAccess { @@ -61,5 +61,5 @@ index 3eaf893cdf..cda718bba0 100644 public void a() { -- -2.25.1 +2.26.2 diff --git a/Spigot-Server-Patches/0446-Optimise-TickListServer-by-rewriting-it.patch b/Spigot-Server-Patches/0446-Optimise-TickListServer-by-rewriting-it.patch index 17efeff979..099840b00e 100644 --- a/Spigot-Server-Patches/0446-Optimise-TickListServer-by-rewriting-it.patch +++ b/Spigot-Server-Patches/0446-Optimise-TickListServer-by-rewriting-it.patch @@ -1,4 +1,4 @@ -From d68c3922b8ad5380a018e2302e703d9066c659c5 Mon Sep 17 00:00:00 2001 +From fddb66ce22f3c1bbae3b98b54cfd7939fcfa9320 Mon Sep 17 00:00:00 2001 From: Spottedleaf Date: Fri, 14 Feb 2020 01:24:39 -0800 Subject: [PATCH] Optimise TickListServer by rewriting it diff --git a/Spigot-Server-Patches/0447-Reduce-entity-tracker-updates-on-move.patch b/Spigot-Server-Patches/0447-Reduce-entity-tracker-updates-on-move.patch index 37ec006e17..ff7f3fd4f8 100644 --- a/Spigot-Server-Patches/0447-Reduce-entity-tracker-updates-on-move.patch +++ b/Spigot-Server-Patches/0447-Reduce-entity-tracker-updates-on-move.patch @@ -1,4 +1,4 @@ -From ee5f32adf9899ad77d47aa5e49d30b2175533a6b Mon Sep 17 00:00:00 2001 +From 8a760283129e8313839f6fa60e7275446201e46a Mon Sep 17 00:00:00 2001 From: froobynooby Date: Thu, 20 Feb 2020 15:50:49 +0930 Subject: [PATCH] Reduce entity tracker updates on move @@ -54,7 +54,7 @@ index 7ca67a4aa5..e93176d8f2 100644 + } } diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java -index 24545b3349..828ba4584b 100644 +index cf837bdb3b..9da6ed85fa 100644 --- a/src/main/java/net/minecraft/server/EntityPlayer.java +++ b/src/main/java/net/minecraft/server/EntityPlayer.java @@ -86,6 +86,10 @@ public class EntityPlayer extends EntityHuman implements ICrafting { @@ -69,7 +69,7 @@ index 24545b3349..828ba4584b 100644 // CraftBukkit start public String displayName; diff --git a/src/main/java/net/minecraft/server/PlayerChunkMap.java b/src/main/java/net/minecraft/server/PlayerChunkMap.java -index 70c4bf7287..f570c40496 100644 +index 043ba702d7..8f477767b9 100644 --- a/src/main/java/net/minecraft/server/PlayerChunkMap.java +++ b/src/main/java/net/minecraft/server/PlayerChunkMap.java @@ -133,6 +133,39 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d { diff --git a/Spigot-Server-Patches/0448-Pillager-patrol-spawn-settings-and-per-player-option.patch b/Spigot-Server-Patches/0448-Pillager-patrol-spawn-settings-and-per-player-option.patch index b1de3ed6a4..20e18acbf0 100644 --- a/Spigot-Server-Patches/0448-Pillager-patrol-spawn-settings-and-per-player-option.patch +++ b/Spigot-Server-Patches/0448-Pillager-patrol-spawn-settings-and-per-player-option.patch @@ -1,4 +1,4 @@ -From 7b93ea1e7e36304032f63191c067f6476d1a96d8 Mon Sep 17 00:00:00 2001 +From af50e068e7f0dfcf365d1ce5f047c4945ef86ea0 Mon Sep 17 00:00:00 2001 From: Phoenix616 Date: Sat, 1 Feb 2020 16:50:39 +0100 Subject: [PATCH] Pillager patrol spawn settings and per player options @@ -10,7 +10,7 @@ When not per player it will use the Vanilla mechanic of one delay per world and the world age for the start day. diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index e93176d8..659a011e 100644 +index e93176d8f2..659a011e97 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java @@ -641,10 +641,21 @@ public class PaperWorldConfig { @@ -36,7 +36,7 @@ index e93176d8..659a011e 100644 private void entitiesTargetWithFollowRange() { entitiesTargetWithFollowRange = getBoolean("entities-target-with-follow-range", entitiesTargetWithFollowRange); diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java -index 828ba458..7e269d61 100644 +index 9da6ed85fa..c6474aa0f8 100644 --- a/src/main/java/net/minecraft/server/EntityPlayer.java +++ b/src/main/java/net/minecraft/server/EntityPlayer.java @@ -77,6 +77,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting { @@ -48,7 +48,7 @@ index 828ba458..7e269d61 100644 public boolean queueHealthUpdatePacket = false; public net.minecraft.server.PacketPlayOutUpdateHealth queuedHealthUpdatePacket; diff --git a/src/main/java/net/minecraft/server/MobSpawnerPatrol.java b/src/main/java/net/minecraft/server/MobSpawnerPatrol.java -index a0f58280..edca6d3a 100644 +index a0f5828076..edca6d3abd 100644 --- a/src/main/java/net/minecraft/server/MobSpawnerPatrol.java +++ b/src/main/java/net/minecraft/server/MobSpawnerPatrol.java @@ -4,12 +4,14 @@ import java.util.Random; @@ -128,7 +128,7 @@ index a0f58280..edca6d3a 100644 if (entityhuman.isSpectator()) { return 0; diff --git a/src/main/java/net/minecraft/server/StatisticWrapper.java b/src/main/java/net/minecraft/server/StatisticWrapper.java -index 3b603403..9c95c0cc 100644 +index 3b6034038a..9c95c0ccfc 100644 --- a/src/main/java/net/minecraft/server/StatisticWrapper.java +++ b/src/main/java/net/minecraft/server/StatisticWrapper.java @@ -27,6 +27,7 @@ public class StatisticWrapper implements Iterable> { @@ -140,5 +140,5 @@ index 3b603403..9c95c0cc 100644 return this.a(t0, Counter.DEFAULT); } -- -2.25.1.windows.1 +2.26.2 diff --git a/Spigot-Server-Patches/0449-Ensure-Entity-is-never-double-registered.patch b/Spigot-Server-Patches/0449-Ensure-Entity-is-never-double-registered.patch index 3cc8e67356..b2e57c2909 100644 --- a/Spigot-Server-Patches/0449-Ensure-Entity-is-never-double-registered.patch +++ b/Spigot-Server-Patches/0449-Ensure-Entity-is-never-double-registered.patch @@ -1,4 +1,4 @@ -From 175903c5f46c71f254704cc6bd336d6b965da427 Mon Sep 17 00:00:00 2001 +From ff553a44163ebec14ee14149ece19c35bcbe6bca Mon Sep 17 00:00:00 2001 From: Aikar Date: Sun, 29 Mar 2020 18:26:14 -0400 Subject: [PATCH] Ensure Entity is never double registered @@ -11,7 +11,7 @@ Vs behavior of non ticking of just overwriting state. We will now simply log a warning when this happens instead of crashing the server. diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java -index 16f2e32d23..9cb4e5a1e6 100644 +index 00df89d650..0dbe2dce11 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java @@ -59,6 +59,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke diff --git a/Spigot-Server-Patches/0450-Fix-unregistering-entities-from-unloading-chunks.patch b/Spigot-Server-Patches/0450-Fix-unregistering-entities-from-unloading-chunks.patch index c908c9f421..c220601421 100644 --- a/Spigot-Server-Patches/0450-Fix-unregistering-entities-from-unloading-chunks.patch +++ b/Spigot-Server-Patches/0450-Fix-unregistering-entities-from-unloading-chunks.patch @@ -1,4 +1,4 @@ -From a0515596981b6463ee95682428a6934643eee6b1 Mon Sep 17 00:00:00 2001 +From 233dec6facb9b9c1c11989bf62e504303c9a4d56 Mon Sep 17 00:00:00 2001 From: Aikar Date: Tue, 31 Mar 2020 03:01:45 -0400 Subject: [PATCH] Fix unregistering entities from unloading chunks diff --git a/Spigot-Server-Patches/0451-Remote-Connections-shouldn-t-hold-up-shutdown.patch b/Spigot-Server-Patches/0451-Remote-Connections-shouldn-t-hold-up-shutdown.patch index c5a5c26a9b..00f4cf8387 100644 --- a/Spigot-Server-Patches/0451-Remote-Connections-shouldn-t-hold-up-shutdown.patch +++ b/Spigot-Server-Patches/0451-Remote-Connections-shouldn-t-hold-up-shutdown.patch @@ -1,4 +1,4 @@ -From 96ff6b7f532c38d3472ef02ad178351fa76195d7 Mon Sep 17 00:00:00 2001 +From 23ff45ad57869e36aa344f11b7c7f5ad6b028289 Mon Sep 17 00:00:00 2001 From: Aikar Date: Tue, 31 Mar 2020 03:50:42 -0400 Subject: [PATCH] Remote Connections shouldn't hold up shutdown @@ -6,7 +6,7 @@ Subject: [PATCH] Remote Connections shouldn't hold up shutdown Bugs in the connection logic appears to leave stale connections even, preventing shutdown diff --git a/src/main/java/net/minecraft/server/DedicatedServer.java b/src/main/java/net/minecraft/server/DedicatedServer.java -index 349a0ea2..1ef7890d 100644 +index 349a0ea213..1ef7890da5 100644 --- a/src/main/java/net/minecraft/server/DedicatedServer.java +++ b/src/main/java/net/minecraft/server/DedicatedServer.java @@ -415,11 +415,11 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer @@ -24,5 +24,5 @@ index 349a0ea2..1ef7890d 100644 System.exit(0); // CraftBukkit -- -2.25.1.windows.1 +2.26.2 diff --git a/Spigot-Server-Patches/0452-Do-not-allow-bees-to-load-chunks-for-beehives.patch b/Spigot-Server-Patches/0452-Do-not-allow-bees-to-load-chunks-for-beehives.patch index 5a62563878..a443ba4cab 100644 --- a/Spigot-Server-Patches/0452-Do-not-allow-bees-to-load-chunks-for-beehives.patch +++ b/Spigot-Server-Patches/0452-Do-not-allow-bees-to-load-chunks-for-beehives.patch @@ -1,4 +1,4 @@ -From ae437c7a8fa1c923d90945d464f5de915abb6530 Mon Sep 17 00:00:00 2001 +From 69d5b79f2d4fb9d153dba0484afc7f4325688594 Mon Sep 17 00:00:00 2001 From: chickeneer Date: Tue, 17 Mar 2020 14:18:50 -0500 Subject: [PATCH] Do not allow bees to load chunks for beehives diff --git a/Spigot-Server-Patches/0453-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch b/Spigot-Server-Patches/0453-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch index 3571777ac6..4f1cb66de9 100644 --- a/Spigot-Server-Patches/0453-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch +++ b/Spigot-Server-Patches/0453-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch @@ -1,4 +1,4 @@ -From 3ecc6bbeefb3fa6add163a675c12416c393797e8 Mon Sep 17 00:00:00 2001 +From 97238d4fbd5f5e6a5da9f051e50751ff70c76dcb Mon Sep 17 00:00:00 2001 From: Aikar Date: Thu, 2 Apr 2020 01:42:39 -0400 Subject: [PATCH] Prevent Double PlayerChunkMap adds crashing server @@ -7,7 +7,7 @@ Suspected case would be around the technique used in .stopRiding Stack will identify any causer of this and warn instead of crashing. diff --git a/src/main/java/net/minecraft/server/PlayerChunkMap.java b/src/main/java/net/minecraft/server/PlayerChunkMap.java -index 7e7d7308f2..a61510c944 100644 +index 8f477767b9..7647b804fa 100644 --- a/src/main/java/net/minecraft/server/PlayerChunkMap.java +++ b/src/main/java/net/minecraft/server/PlayerChunkMap.java @@ -1489,6 +1489,14 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d { diff --git a/Spigot-Server-Patches/0454-Optimize-Collision-Chunk-lookup-and-avoid-loading-fa.patch b/Spigot-Server-Patches/0454-Optimize-Collision-Chunk-lookup-and-avoid-loading-fa.patch index f2ba7aa55b..022025583d 100644 --- a/Spigot-Server-Patches/0454-Optimize-Collision-Chunk-lookup-and-avoid-loading-fa.patch +++ b/Spigot-Server-Patches/0454-Optimize-Collision-Chunk-lookup-and-avoid-loading-fa.patch @@ -1,4 +1,4 @@ -From a56120c2a391adb9f33f16ba182c59660359e064 Mon Sep 17 00:00:00 2001 +From ef055b2d308e7f386a101f0aabd78afbb34cdaed Mon Sep 17 00:00:00 2001 From: Aikar Date: Thu, 2 Apr 2020 02:37:57 -0400 Subject: [PATCH] Optimize Collision Chunk lookup and avoid loading far chunks @@ -10,7 +10,7 @@ The collision code takes an AABB and generates a cuboid of checks rather than a cylinder, so at high velocity this can generate a lot of chunk checks. diff --git a/src/main/java/net/minecraft/server/ICollisionAccess.java b/src/main/java/net/minecraft/server/ICollisionAccess.java -index f851ed11..d1544872 100644 +index f851ed11df..d154487294 100644 --- a/src/main/java/net/minecraft/server/ICollisionAccess.java +++ b/src/main/java/net/minecraft/server/ICollisionAccess.java @@ -83,15 +83,19 @@ public interface ICollisionAccess extends IBlockAccess { @@ -38,5 +38,5 @@ index f851ed11..d1544872 100644 if (iblockaccess != null) { blockposition_mutableblockposition.d(k1, l1, i2); -- -2.25.1.windows.1 +2.26.2 diff --git a/Spigot-Server-Patches/0455-Don-t-tick-dead-players.patch b/Spigot-Server-Patches/0455-Don-t-tick-dead-players.patch index 31092ef520..0efa0d5f25 100644 --- a/Spigot-Server-Patches/0455-Don-t-tick-dead-players.patch +++ b/Spigot-Server-Patches/0455-Don-t-tick-dead-players.patch @@ -1,4 +1,4 @@ -From 7533a289cfe70bfcc97a6c596cedd91e5a0889df Mon Sep 17 00:00:00 2001 +From 30e0809c5100d315a28125aa652910f42ef76fbf Mon Sep 17 00:00:00 2001 From: Aikar Date: Thu, 2 Apr 2020 17:16:48 -0400 Subject: [PATCH] Don't tick dead players @@ -7,7 +7,7 @@ Causes sync chunk loads and who knows what all else. This is safe because Spectators are skipped in unloaded chunks too in vanilla. diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java -index 7e269d61..94b096f2 100644 +index c6474aa0f8..a16a8c10a2 100644 --- a/src/main/java/net/minecraft/server/EntityPlayer.java +++ b/src/main/java/net/minecraft/server/EntityPlayer.java @@ -433,7 +433,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting { @@ -20,5 +20,5 @@ index 7e269d61..94b096f2 100644 } -- -2.25.1.windows.1 +2.26.2 diff --git a/Spigot-Server-Patches/0456-Dead-Player-s-shouldn-t-be-able-to-move.patch b/Spigot-Server-Patches/0456-Dead-Player-s-shouldn-t-be-able-to-move.patch index 6d4f97cda6..d8495d1c03 100644 --- a/Spigot-Server-Patches/0456-Dead-Player-s-shouldn-t-be-able-to-move.patch +++ b/Spigot-Server-Patches/0456-Dead-Player-s-shouldn-t-be-able-to-move.patch @@ -1,4 +1,4 @@ -From 2fc6a06f92ce8fc68f5ac9ad35c7e9b30f9ec8a4 Mon Sep 17 00:00:00 2001 +From 5c0011d7d238914c4a29da2f28095f31c7aad451 Mon Sep 17 00:00:00 2001 From: Aikar Date: Thu, 2 Apr 2020 19:31:16 -0400 Subject: [PATCH] Dead Player's shouldn't be able to move @@ -7,7 +7,7 @@ This fixes a lot of game state issues where packets were delayed for processing due to 1.15's new queue but processed while dead. diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java -index 584166f2..7afcde60 100644 +index 61c9e030a1..c4d4334305 100644 --- a/src/main/java/net/minecraft/server/EntityHuman.java +++ b/src/main/java/net/minecraft/server/EntityHuman.java @@ -978,7 +978,7 @@ public abstract class EntityHuman extends EntityLiving { @@ -20,5 +20,5 @@ index 584166f2..7afcde60 100644 @Override -- -2.25.1.windows.1 +2.26.2 diff --git a/Spigot-Server-Patches/0457-Optimize-PlayerChunkMap-memory-use-for-visibleChunks.patch b/Spigot-Server-Patches/0457-Optimize-PlayerChunkMap-memory-use-for-visibleChunks.patch index 3da80e9822..7d5097870a 100644 --- a/Spigot-Server-Patches/0457-Optimize-PlayerChunkMap-memory-use-for-visibleChunks.patch +++ b/Spigot-Server-Patches/0457-Optimize-PlayerChunkMap-memory-use-for-visibleChunks.patch @@ -1,4 +1,4 @@ -From bc07d66a6ee5dc72d302c0bbe93e379565625867 Mon Sep 17 00:00:00 2001 +From a6fbb1690cd064660bca6797edd6afcaec9e1b19 Mon Sep 17 00:00:00 2001 From: Aikar Date: Wed, 8 Apr 2020 03:06:30 -0400 Subject: [PATCH] Optimize PlayerChunkMap memory use for visibleChunks @@ -213,7 +213,7 @@ index 7647b804fa..fb7bbe8744 100644 while (objectbidirectionaliterator.hasNext()) { Entry entry = (Entry) objectbidirectionaliterator.next(); diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -index 9e0979c9b3..3bce735f88 100644 +index 07ebd78acc..b70c0fd977 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java @@ -74,6 +74,7 @@ import net.minecraft.server.GameRules; diff --git a/Spigot-Server-Patches/0458-Don-t-load-chunks-when-attempting-to-unload-a-chunk.patch b/Spigot-Server-Patches/0458-Don-t-load-chunks-when-attempting-to-unload-a-chunk.patch index 46b0a8a23b..cc8ad6ba15 100644 --- a/Spigot-Server-Patches/0458-Don-t-load-chunks-when-attempting-to-unload-a-chunk.patch +++ b/Spigot-Server-Patches/0458-Don-t-load-chunks-when-attempting-to-unload-a-chunk.patch @@ -1,4 +1,4 @@ -From 4871bd47aebe58237761a627e920db06f3efa47c Mon Sep 17 00:00:00 2001 +From 033758c1aa7ac67619a80cbfb50e858146141638 Mon Sep 17 00:00:00 2001 From: Aikar Date: Wed, 8 Apr 2020 21:07:08 -0400 Subject: [PATCH] Don't load chunks when attempting to unload a chunk @@ -6,7 +6,7 @@ Subject: [PATCH] Don't load chunks when attempting to unload a chunk Big Brain Logic diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -index 3bce735f88..b962dbfdfe 100644 +index b70c0fd977..eb7b48422e 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java @@ -473,7 +473,7 @@ public class CraftWorld implements World { diff --git a/Spigot-Server-Patches/0459-Increase-Light-Queue-Size.patch b/Spigot-Server-Patches/0459-Increase-Light-Queue-Size.patch index ac8efe3f66..abdf0fab53 100644 --- a/Spigot-Server-Patches/0459-Increase-Light-Queue-Size.patch +++ b/Spigot-Server-Patches/0459-Increase-Light-Queue-Size.patch @@ -1,4 +1,4 @@ -From 7fc3596271b060da1b9ea1c95c376b121cd52aa6 Mon Sep 17 00:00:00 2001 +From b739b47db7bd4f5083b98e6168f265f53c272411 Mon Sep 17 00:00:00 2001 From: Aikar Date: Wed, 8 Apr 2020 21:24:05 -0400 Subject: [PATCH] Increase Light Queue Size @@ -14,7 +14,7 @@ light engine on shutdown... The queue size only puts a cap on max loss, doesn't solve that problem. diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index 659a011e..88a45e51 100644 +index 659a011e97..88a45e517c 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java @@ -684,4 +684,9 @@ public class PaperWorldConfig { @@ -28,7 +28,7 @@ index 659a011e..88a45e51 100644 + } } diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index ec9ff06c..e35bacac 100644 +index d1f82eff21..77adc64e30 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -637,7 +637,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant Date: Thu, 9 Apr 2020 00:09:26 -0400 Subject: [PATCH] Mid Tick Chunk Tasks - Speed up processing of chunk loads and diff --git a/Spigot-Server-Patches/0461-Don-t-move-existing-players-to-world-spawn.patch b/Spigot-Server-Patches/0461-Don-t-move-existing-players-to-world-spawn.patch index 304d86888b..a1390a39a6 100644 --- a/Spigot-Server-Patches/0461-Don-t-move-existing-players-to-world-spawn.patch +++ b/Spigot-Server-Patches/0461-Don-t-move-existing-players-to-world-spawn.patch @@ -1,4 +1,4 @@ -From e1ca654b67622a81e9d330da55f197bc194832a4 Mon Sep 17 00:00:00 2001 +From 3761e0c1541d0ec88c01ac318204538ee4c43315 Mon Sep 17 00:00:00 2001 From: Aikar Date: Thu, 9 Apr 2020 21:20:33 -0400 Subject: [PATCH] Don't move existing players to world spawn @@ -10,7 +10,7 @@ larger than the keep loaded range. By skipping this, we avoid potential for a large spike on server start. diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java -index 94b096f2..d16f3880 100644 +index a16a8c10a2..50886c1374 100644 --- a/src/main/java/net/minecraft/server/EntityPlayer.java +++ b/src/main/java/net/minecraft/server/EntityPlayer.java @@ -118,7 +118,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting { @@ -40,7 +40,7 @@ index 94b096f2..d16f3880 100644 this.dimension = ((WorldServer) this.world).getWorldProvider().getDimensionManager(); this.playerInteractManager.a((WorldServer) world); diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java -index 01345a62..dfe62515 100644 +index 01345a62b7..dfe6251576 100644 --- a/src/main/java/net/minecraft/server/PlayerList.java +++ b/src/main/java/net/minecraft/server/PlayerList.java @@ -108,6 +108,7 @@ public abstract class PlayerList { @@ -52,5 +52,5 @@ index 01345a62..dfe62515 100644 entityplayer.spawnIn(worldserver); -- -2.25.1.windows.1 +2.26.2 diff --git a/Spigot-Server-Patches/0462-Add-tick-times-API-and-mspt-command.patch b/Spigot-Server-Patches/0462-Add-tick-times-API-and-mspt-command.patch index 69e2cf8ac2..e864318568 100644 --- a/Spigot-Server-Patches/0462-Add-tick-times-API-and-mspt-command.patch +++ b/Spigot-Server-Patches/0462-Add-tick-times-API-and-mspt-command.patch @@ -1,4 +1,4 @@ -From bbe304c80e60c830e3256b169ac709b5d8c490c8 Mon Sep 17 00:00:00 2001 +From e4d890492f643d70c8e2d0dad49d78d609e6accc Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Sun, 5 Apr 2020 22:23:14 -0500 Subject: [PATCH] Add tick times API and /mspt command diff --git a/Spigot-Server-Patches/0463-Expose-MinecraftServer-isRunning.patch b/Spigot-Server-Patches/0463-Expose-MinecraftServer-isRunning.patch index 7312da32ef..1c17772a39 100644 --- a/Spigot-Server-Patches/0463-Expose-MinecraftServer-isRunning.patch +++ b/Spigot-Server-Patches/0463-Expose-MinecraftServer-isRunning.patch @@ -1,4 +1,4 @@ -From aaa228a46eeb34f71d7587cb7220e1dac0afcf75 Mon Sep 17 00:00:00 2001 +From 5e7de5d0f599813f82721752e666d40a95e9a096 Mon Sep 17 00:00:00 2001 From: JRoy Date: Fri, 10 Apr 2020 21:24:12 -0400 Subject: [PATCH] Expose MinecraftServer#isRunning diff --git a/Spigot-Server-Patches/0464-Implement-Chunk-Priority-Urgency-System-for-World-Ge.patch b/Spigot-Server-Patches/0464-Implement-Chunk-Priority-Urgency-System-for-World-Ge.patch index cc3eb08863..486ac40616 100644 --- a/Spigot-Server-Patches/0464-Implement-Chunk-Priority-Urgency-System-for-World-Ge.patch +++ b/Spigot-Server-Patches/0464-Implement-Chunk-Priority-Urgency-System-for-World-Ge.patch @@ -1,4 +1,4 @@ -From 2d591a6ae7d57ecdb73e3af88181f7636c415f7c Mon Sep 17 00:00:00 2001 +From f311f269de4a50bb27e9d23f7f034d1ba5bd67a8 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sat, 11 Apr 2020 03:56:07 -0400 Subject: [PATCH] Implement Chunk Priority / Urgency System for World Gen @@ -197,7 +197,7 @@ index 04b97cec29..568fbbd5f2 100644 private void d(int i) { diff --git a/src/main/java/net/minecraft/server/PlayerChunkMap.java b/src/main/java/net/minecraft/server/PlayerChunkMap.java -index 63969e16aa..377676b94b 100644 +index fb7bbe8744..6fa70eb08d 100644 --- a/src/main/java/net/minecraft/server/PlayerChunkMap.java +++ b/src/main/java/net/minecraft/server/PlayerChunkMap.java @@ -324,6 +324,7 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d { diff --git a/Spigot-Server-Patches/0465-Remove-streams-from-Mob-AI-System.patch b/Spigot-Server-Patches/0465-Remove-streams-from-Mob-AI-System.patch index b4a4f435b5..6d446cc3bd 100644 --- a/Spigot-Server-Patches/0465-Remove-streams-from-Mob-AI-System.patch +++ b/Spigot-Server-Patches/0465-Remove-streams-from-Mob-AI-System.patch @@ -1,4 +1,4 @@ -From 1591a88c30094f7de7f93f17b9d14e96daa63ca3 Mon Sep 17 00:00:00 2001 +From 92483b5800e7db9d3c1046ab607bec5e35b9ee4f Mon Sep 17 00:00:00 2001 From: Spottedleaf Date: Mon, 6 Apr 2020 17:53:29 -0700 Subject: [PATCH] Remove streams from Mob AI System @@ -10,7 +10,7 @@ Also optimise the stream.anyMatch statement to move to a bitset where we can replace the call with a single bitwise operation. diff --git a/src/main/java/net/minecraft/server/PathfinderGoal.java b/src/main/java/net/minecraft/server/PathfinderGoal.java -index bdb90a34..134f7d00 100644 +index bdb90a3466..134f7d0013 100644 --- a/src/main/java/net/minecraft/server/PathfinderGoal.java +++ b/src/main/java/net/minecraft/server/PathfinderGoal.java @@ -1,10 +1,11 @@ @@ -52,7 +52,7 @@ index bdb90a34..134f7d00 100644 public static enum Type { diff --git a/src/main/java/net/minecraft/server/PathfinderGoalSelector.java b/src/main/java/net/minecraft/server/PathfinderGoalSelector.java -index 93513677..90319909 100644 +index 935136771e..90319909e5 100644 --- a/src/main/java/net/minecraft/server/PathfinderGoalSelector.java +++ b/src/main/java/net/minecraft/server/PathfinderGoalSelector.java @@ -1,8 +1,10 @@ @@ -230,7 +230,7 @@ index 93513677..90319909 100644 public void a(PathfinderGoal.Type pathfindergoal_type, boolean flag) { diff --git a/src/main/java/net/minecraft/server/PathfinderGoalWrapped.java b/src/main/java/net/minecraft/server/PathfinderGoalWrapped.java -index 29657fed..1b800c55 100644 +index 29657fed75..1b800c558f 100644 --- a/src/main/java/net/minecraft/server/PathfinderGoalWrapped.java +++ b/src/main/java/net/minecraft/server/PathfinderGoalWrapped.java @@ -59,9 +59,10 @@ public class PathfinderGoalWrapped extends PathfinderGoal { @@ -248,5 +248,5 @@ index 29657fed..1b800c55 100644 public boolean isRunning() { return this.g(); } // Paper - OBFHELPER -- -2.25.1.windows.1 +2.26.2 diff --git a/Spigot-Server-Patches/0466-Delay-unsafe-actions-until-after-entity-ticking-is-d.patch b/Spigot-Server-Patches/0466-Delay-unsafe-actions-until-after-entity-ticking-is-d.patch index f60cb8728b..2fabe65e5a 100644 --- a/Spigot-Server-Patches/0466-Delay-unsafe-actions-until-after-entity-ticking-is-d.patch +++ b/Spigot-Server-Patches/0466-Delay-unsafe-actions-until-after-entity-ticking-is-d.patch @@ -1,4 +1,4 @@ -From b732b943c32cdc2dd199c5846cf85f6cc83bca1f Mon Sep 17 00:00:00 2001 +From f6bbc419402487cc17d4788ab2c10812abe20e24 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sat, 11 Apr 2020 21:23:42 -0400 Subject: [PATCH] Delay unsafe actions until after entity ticking is done @@ -44,10 +44,10 @@ index dc01fb494d..d13dc8fce9 100644 try (co.aikar.timings.Timing ignored = this.timings.newEntities.startTiming()) { // Paper - timings diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -index b962dbfdfe..c9e5330948 100644 +index eb7b48422e..ac257d50de 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -@@ -2475,7 +2475,7 @@ public class CraftWorld implements World { +@@ -2473,7 +2473,7 @@ public class CraftWorld implements World { CompletableFuture ret = new CompletableFuture<>(); this.world.getChunkProvider().getChunkAtAsynchronously(x, z, gen, (net.minecraft.server.Chunk chunk) -> { diff --git a/Spigot-Server-Patches/0467-Async-command-map-building.patch b/Spigot-Server-Patches/0467-Async-command-map-building.patch index e5f0e846cf..7404557e1b 100644 --- a/Spigot-Server-Patches/0467-Async-command-map-building.patch +++ b/Spigot-Server-Patches/0467-Async-command-map-building.patch @@ -1,11 +1,11 @@ -From 78ca70e7313f5418ad4888809d113310b853b4d6 Mon Sep 17 00:00:00 2001 +From 889fc731b808cb2bc652eac6fde35ff5d08420a6 Mon Sep 17 00:00:00 2001 From: Callahan Date: Wed, 8 Apr 2020 02:42:14 -0500 Subject: [PATCH] Async command map building diff --git a/src/main/java/net/minecraft/server/CommandDispatcher.java b/src/main/java/net/minecraft/server/CommandDispatcher.java -index 37b1a794..2414b0a5 100644 +index 37b1a7947c..2414b0a552 100644 --- a/src/main/java/net/minecraft/server/CommandDispatcher.java +++ b/src/main/java/net/minecraft/server/CommandDispatcher.java @@ -241,6 +241,14 @@ public class CommandDispatcher { @@ -39,5 +39,5 @@ index 37b1a794..2414b0a5 100644 event.getPlayer().getServer().getPluginManager().callEvent(event); -- -2.25.1.windows.1 +2.26.2 diff --git a/Spigot-Server-Patches/0468-Forced-Watchdog-Crash-support-and-Improve-Async-Shut.patch b/Spigot-Server-Patches/0468-Forced-Watchdog-Crash-support-and-Improve-Async-Shut.patch index 847c0ae9e3..30a3738e17 100644 --- a/Spigot-Server-Patches/0468-Forced-Watchdog-Crash-support-and-Improve-Async-Shut.patch +++ b/Spigot-Server-Patches/0468-Forced-Watchdog-Crash-support-and-Improve-Async-Shut.patch @@ -1,4 +1,4 @@ -From a79d22f5d245994d6a1af90e8b709ab20b3f77a7 Mon Sep 17 00:00:00 2001 +From f96d0a3291633d69748de86bc0f5df2de0a1ba83 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sun, 12 Apr 2020 15:50:48 -0400 Subject: [PATCH] Forced Watchdog Crash support and Improve Async Shutdown diff --git a/Spigot-Server-Patches/0469-Optimize-Pathfinding.patch b/Spigot-Server-Patches/0469-Optimize-Pathfinding.patch index e775fb96e6..b709b7708c 100644 --- a/Spigot-Server-Patches/0469-Optimize-Pathfinding.patch +++ b/Spigot-Server-Patches/0469-Optimize-Pathfinding.patch @@ -1,4 +1,4 @@ -From c991ef4d5a27707d1c2046838c774b3b4bdbe3e6 Mon Sep 17 00:00:00 2001 +From d80ac90428fba1fbc926e48af6d01dae922bafb1 Mon Sep 17 00:00:00 2001 From: Aikar Date: Thu, 3 Mar 2016 02:02:07 -0600 Subject: [PATCH] Optimize Pathfinding @@ -7,7 +7,7 @@ Prevents pathfinding from spamming failures for things such as arrow attacks. diff --git a/src/main/java/net/minecraft/server/NavigationAbstract.java b/src/main/java/net/minecraft/server/NavigationAbstract.java -index f0676497..dc32107e 100644 +index f06764973f..dc32107ec3 100644 --- a/src/main/java/net/minecraft/server/NavigationAbstract.java +++ b/src/main/java/net/minecraft/server/NavigationAbstract.java @@ -11,7 +11,7 @@ public abstract class NavigationAbstract { @@ -52,5 +52,5 @@ index f0676497..dc32107e 100644 public boolean setDestination(@Nullable PathEntity pathentity, double speed) { return a(pathentity, speed); } // Paper - OBFHELPER -- -2.25.1.windows.1 +2.26.2 diff --git a/Spigot-Server-Patches/0470-Port-20w15a-Villager-AI-optimizations-DROP-1.16.patch b/Spigot-Server-Patches/0470-Port-20w15a-Villager-AI-optimizations-DROP-1.16.patch index 77bd8a5651..8e1eef0b54 100644 --- a/Spigot-Server-Patches/0470-Port-20w15a-Villager-AI-optimizations-DROP-1.16.patch +++ b/Spigot-Server-Patches/0470-Port-20w15a-Villager-AI-optimizations-DROP-1.16.patch @@ -1,4 +1,4 @@ -From 93fcb8bd718fccbbc4a1e3150b9b2898be11bf73 Mon Sep 17 00:00:00 2001 +From 555e1d7a914a914d2fab5912684c5bc79b780456 Mon Sep 17 00:00:00 2001 From: Callahan Date: Wed, 8 Apr 2020 18:00:17 -0500 Subject: [PATCH] Port 20w15a Villager AI optimizations - DROP 1.16 diff --git a/Spigot-Server-Patches/0471-Reduce-Either-Optional-allocation.patch b/Spigot-Server-Patches/0471-Reduce-Either-Optional-allocation.patch index a912f45bc2..206ad736e2 100644 --- a/Spigot-Server-Patches/0471-Reduce-Either-Optional-allocation.patch +++ b/Spigot-Server-Patches/0471-Reduce-Either-Optional-allocation.patch @@ -1,4 +1,4 @@ -From 9db1d92fce05f586d5a8a0d1960754fc4419548e Mon Sep 17 00:00:00 2001 +From 01b45b03af99ed2ec19a8621acfb28354c6b3cbf Mon Sep 17 00:00:00 2001 From: Spottedleaf Date: Mon, 6 Apr 2020 18:35:09 -0700 Subject: [PATCH] Reduce Either Optional allocation @@ -7,7 +7,7 @@ In order to get chunk values, we shouldn't need to create an optional each time. diff --git a/src/main/java/com/mojang/datafixers/util/Either.java b/src/main/java/com/mojang/datafixers/util/Either.java -index a90adac7..3f65fe71 100644 +index a90adac7bd..3f65fe7102 100644 --- a/src/main/java/com/mojang/datafixers/util/Either.java +++ b/src/main/java/com/mojang/datafixers/util/Either.java @@ -22,7 +22,7 @@ public abstract class Either implements App, L> { @@ -47,5 +47,5 @@ index a90adac7..3f65fe71 100644 @Override -- -2.25.1.windows.1 +2.26.2 diff --git a/Spigot-Server-Patches/0472-Remove-streams-from-PairedQueue.patch b/Spigot-Server-Patches/0472-Remove-streams-from-PairedQueue.patch index da51c84808..ca81fefe8c 100644 --- a/Spigot-Server-Patches/0472-Remove-streams-from-PairedQueue.patch +++ b/Spigot-Server-Patches/0472-Remove-streams-from-PairedQueue.patch @@ -1,4 +1,4 @@ -From fad22dfe20f3e647838d93f9b0e41ef61986eb60 Mon Sep 17 00:00:00 2001 +From 9f7926a05f4689b2ec3033679fbe04acf2b73511 Mon Sep 17 00:00:00 2001 From: Spottedleaf Date: Mon, 6 Apr 2020 18:10:43 -0700 Subject: [PATCH] Remove streams from PairedQueue @@ -7,7 +7,7 @@ We shouldn't be doing stream calls just to see if the queue is empty. This creates loads of garbage thanks to how often it's called. diff --git a/src/main/java/net/minecraft/server/PairedQueue.java b/src/main/java/net/minecraft/server/PairedQueue.java -index 85bb22e4..2369afb4 100644 +index 85bb22e4b7..2369afb4f3 100644 --- a/src/main/java/net/minecraft/server/PairedQueue.java +++ b/src/main/java/net/minecraft/server/PairedQueue.java @@ -20,32 +20,30 @@ public interface PairedQueue { @@ -78,5 +78,5 @@ index 85bb22e4..2369afb4 100644 } -- -2.25.1.windows.1 +2.26.2 diff --git a/Spigot-Server-Patches/0473-Remove-streams-from-MinecraftKey.patch b/Spigot-Server-Patches/0473-Remove-streams-from-MinecraftKey.patch index 5336fabfbd..f94a6f685f 100644 --- a/Spigot-Server-Patches/0473-Remove-streams-from-MinecraftKey.patch +++ b/Spigot-Server-Patches/0473-Remove-streams-from-MinecraftKey.patch @@ -1,4 +1,4 @@ -From 744f80a2c7cee1fd31f773eecbb4d34b3987c370 Mon Sep 17 00:00:00 2001 +From f150261d52391ce180d530eb53af8a018db7b031 Mon Sep 17 00:00:00 2001 From: Spottedleaf Date: Mon, 6 Apr 2020 18:06:24 -0700 Subject: [PATCH] Remove streams from MinecraftKey @@ -6,7 +6,7 @@ Subject: [PATCH] Remove streams from MinecraftKey They produce a lot of garbage. diff --git a/src/main/java/net/minecraft/server/MinecraftKey.java b/src/main/java/net/minecraft/server/MinecraftKey.java -index 2b271d3e..b1beebf0 100644 +index 2b271d3e50..b1beebf0ed 100644 --- a/src/main/java/net/minecraft/server/MinecraftKey.java +++ b/src/main/java/net/minecraft/server/MinecraftKey.java @@ -125,15 +125,29 @@ public class MinecraftKey implements Comparable { @@ -46,5 +46,5 @@ index 2b271d3e..b1beebf0 100644 public static class a implements JsonDeserializer, JsonSerializer { -- -2.25.1.windows.1 +2.26.2 diff --git a/Spigot-Server-Patches/0474-Reduce-memory-footprint-of-NBTTagCompound.patch b/Spigot-Server-Patches/0474-Reduce-memory-footprint-of-NBTTagCompound.patch index eb9dce0b64..37b4a6e4d1 100644 --- a/Spigot-Server-Patches/0474-Reduce-memory-footprint-of-NBTTagCompound.patch +++ b/Spigot-Server-Patches/0474-Reduce-memory-footprint-of-NBTTagCompound.patch @@ -1,4 +1,4 @@ -From 4b49e049f054821c79c7577cf375cbb86df78b4d Mon Sep 17 00:00:00 2001 +From 1e736388e18981ea7df68a2ad8bb3e313552c362 Mon Sep 17 00:00:00 2001 From: Spottedleaf Date: Mon, 6 Apr 2020 17:39:25 -0700 Subject: [PATCH] Reduce memory footprint of NBTTagCompound @@ -8,7 +8,7 @@ is important because we clone chunk data after reading it for safety. So, reduce the impact of the clone on GC. diff --git a/src/main/java/net/minecraft/server/NBTTagCompound.java b/src/main/java/net/minecraft/server/NBTTagCompound.java -index 98deaba1..02a2ed1b 100644 +index 98deaba12c..02a2ed1baa 100644 --- a/src/main/java/net/minecraft/server/NBTTagCompound.java +++ b/src/main/java/net/minecraft/server/NBTTagCompound.java @@ -31,7 +31,7 @@ public class NBTTagCompound implements NBTBase { @@ -50,5 +50,5 @@ index 98deaba1..02a2ed1b 100644 public boolean equals(Object object) { -- -2.25.1.windows.1 +2.26.2 diff --git a/Spigot-Server-Patches/0475-Prevent-opening-inventories-when-frozen.patch b/Spigot-Server-Patches/0475-Prevent-opening-inventories-when-frozen.patch index 27ae717468..92c9c2a02b 100644 --- a/Spigot-Server-Patches/0475-Prevent-opening-inventories-when-frozen.patch +++ b/Spigot-Server-Patches/0475-Prevent-opening-inventories-when-frozen.patch @@ -1,4 +1,4 @@ -From c6294c9875bb5f2211a4e9189379653710c68e51 Mon Sep 17 00:00:00 2001 +From 73d2319fff6b15279fa8f9360da05bc794267ddb Mon Sep 17 00:00:00 2001 From: Shane Freeder Date: Mon, 13 Apr 2020 07:31:44 +0100 Subject: [PATCH] Prevent opening inventories when frozen diff --git a/Spigot-Server-Patches/0476-Optimise-ArraySetSorted-removeIf.patch b/Spigot-Server-Patches/0476-Optimise-ArraySetSorted-removeIf.patch index 9156be8ae6..171dc3d4e7 100644 --- a/Spigot-Server-Patches/0476-Optimise-ArraySetSorted-removeIf.patch +++ b/Spigot-Server-Patches/0476-Optimise-ArraySetSorted-removeIf.patch @@ -1,4 +1,4 @@ -From 5df019d5fe3c8b5b2056d687ba428ad2ed1beb16 Mon Sep 17 00:00:00 2001 +From a4e973bd1058ee0377e451d5993619881c7fb0a1 Mon Sep 17 00:00:00 2001 From: Spottedleaf Date: Wed, 15 Apr 2020 18:23:28 -0700 Subject: [PATCH] Optimise ArraySetSorted#removeIf @@ -6,7 +6,7 @@ Subject: [PATCH] Optimise ArraySetSorted#removeIf Remove iterator allocation and ensure the call is always O(n) diff --git a/src/main/java/net/minecraft/server/ArraySetSorted.java b/src/main/java/net/minecraft/server/ArraySetSorted.java -index 85f799a7..7db6b585 100644 +index 85f799a713..7db6b5850b 100644 --- a/src/main/java/net/minecraft/server/ArraySetSorted.java +++ b/src/main/java/net/minecraft/server/ArraySetSorted.java @@ -10,8 +10,8 @@ import java.util.NoSuchElementException; @@ -64,5 +64,5 @@ index 85f799a7..7db6b585 100644 return new ArraySetSorted<>(i, (Comparator)Comparator.naturalOrder()); // Paper - decompile fix } -- -2.25.1.windows.1 +2.26.2 diff --git a/Spigot-Server-Patches/0477-Don-t-run-entity-collision-code-if-not-needed.patch b/Spigot-Server-Patches/0477-Don-t-run-entity-collision-code-if-not-needed.patch index c29bd7ffe6..2a0f9d445e 100644 --- a/Spigot-Server-Patches/0477-Don-t-run-entity-collision-code-if-not-needed.patch +++ b/Spigot-Server-Patches/0477-Don-t-run-entity-collision-code-if-not-needed.patch @@ -1,4 +1,4 @@ -From cab3a2fc1109232d67827d3db1f9328c3095de61 Mon Sep 17 00:00:00 2001 +From e357b2e7bad2b540d3cf268978821148fd64fca2 Mon Sep 17 00:00:00 2001 From: Spottedleaf Date: Wed, 15 Apr 2020 17:56:07 -0700 Subject: [PATCH] Don't run entity collision code if not needed diff --git a/Spigot-Server-Patches/0478-Optimise-entity-hard-collision-checking.patch b/Spigot-Server-Patches/0478-Optimise-entity-hard-collision-checking.patch index 8db9e813fe..7ea1590f41 100644 --- a/Spigot-Server-Patches/0478-Optimise-entity-hard-collision-checking.patch +++ b/Spigot-Server-Patches/0478-Optimise-entity-hard-collision-checking.patch @@ -1,4 +1,4 @@ -From 2cd65f7b6d5b4a4feca664d8bf958e097a21e2b0 Mon Sep 17 00:00:00 2001 +From f3fde9e5f48bd872498c06b3df0d7d5575c7ea51 Mon Sep 17 00:00:00 2001 From: Spottedleaf Date: Wed, 15 Apr 2020 18:08:53 -0700 Subject: [PATCH] Optimise entity hard collision checking @@ -88,7 +88,7 @@ index d802acef71..09137d8785 100644 } if (entity instanceof EntityItem) { diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java -index d88e851c4a..89e5fbe51d 100644 +index 0dbe2dce11..324fd07bce 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java @@ -210,6 +210,40 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke diff --git a/Spigot-Server-Patches/0479-Optimize-ChunkProviderServer-s-chunk-level-checking-.patch b/Spigot-Server-Patches/0479-Optimize-ChunkProviderServer-s-chunk-level-checking-.patch index 2d43faf212..74f81aa166 100644 --- a/Spigot-Server-Patches/0479-Optimize-ChunkProviderServer-s-chunk-level-checking-.patch +++ b/Spigot-Server-Patches/0479-Optimize-ChunkProviderServer-s-chunk-level-checking-.patch @@ -1,4 +1,4 @@ -From c4c018236d1050729389fe9a766654280d9508a0 Mon Sep 17 00:00:00 2001 +From 33077c31361140aec39629707334a90a1c1185e5 Mon Sep 17 00:00:00 2001 From: Spottedleaf Date: Thu, 16 Apr 2020 16:13:59 -0700 Subject: [PATCH] Optimize ChunkProviderServer's chunk level checking helper @@ -9,7 +9,7 @@ so inline where possible, and avoid the abstraction of the Either class. diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java -index bcf59beed6..15bd3cacb3 100644 +index 746b5b5589..c2e4e4f6f1 100644 --- a/src/main/java/net/minecraft/server/ChunkProviderServer.java +++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java @@ -615,27 +615,37 @@ public class ChunkProviderServer extends IChunkProvider { @@ -61,5 +61,5 @@ index bcf59beed6..15bd3cacb3 100644 private boolean a(long i, Function>> function) { -- -2.25.1 +2.26.2 diff --git a/Spigot-Server-Patches/0480-Restrict-vanilla-teleport-command-to-valid-locations.patch b/Spigot-Server-Patches/0480-Restrict-vanilla-teleport-command-to-valid-locations.patch index 2b490fd248..5d340f13aa 100644 --- a/Spigot-Server-Patches/0480-Restrict-vanilla-teleport-command-to-valid-locations.patch +++ b/Spigot-Server-Patches/0480-Restrict-vanilla-teleport-command-to-valid-locations.patch @@ -1,4 +1,4 @@ -From 0a04e4326f4985bd0839edf8239ac01bce81b445 Mon Sep 17 00:00:00 2001 +From 53ed8a3225ce805964d5e8ec31df55935d7ba6f4 Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Thu, 16 Apr 2020 20:07:29 -0500 Subject: [PATCH] Restrict vanilla teleport command to valid locations @@ -6,7 +6,7 @@ Subject: [PATCH] Restrict vanilla teleport command to valid locations Fixes GH-3165 diff --git a/src/main/java/net/minecraft/server/CommandTeleport.java b/src/main/java/net/minecraft/server/CommandTeleport.java -index 3060b4f6..79016b58 100644 +index 3060b4f68b..79016b5870 100644 --- a/src/main/java/net/minecraft/server/CommandTeleport.java +++ b/src/main/java/net/minecraft/server/CommandTeleport.java @@ -116,6 +116,12 @@ public class CommandTeleport { @@ -23,5 +23,5 @@ index 3060b4f6..79016b58 100644 ChunkCoordIntPair chunkcoordintpair = new ChunkCoordIntPair(new BlockPosition(d0, d1, d2)); -- -2.25.1.windows.1 +2.26.2 diff --git a/Spigot-Server-Patches/0481-Implement-Player-Client-Options-API.patch b/Spigot-Server-Patches/0481-Implement-Player-Client-Options-API.patch index 125ff6d099..4f507478c6 100644 --- a/Spigot-Server-Patches/0481-Implement-Player-Client-Options-API.patch +++ b/Spigot-Server-Patches/0481-Implement-Player-Client-Options-API.patch @@ -1,4 +1,4 @@ -From d166e9638ad9b6fe12aee5037f72db11e495044f Mon Sep 17 00:00:00 2001 +From 4f94fb854eedf71d0b7908e765e40163fb7d431b Mon Sep 17 00:00:00 2001 From: MiniDigger Date: Mon, 20 Jan 2020 21:38:15 +0100 Subject: [PATCH] Implement Player Client Options API diff --git a/Spigot-Server-Patches/0482-Fix-Chunk-Post-Processing-deadlock-risk.patch b/Spigot-Server-Patches/0482-Fix-Chunk-Post-Processing-deadlock-risk.patch index 492d3fed80..9a0d241deb 100644 --- a/Spigot-Server-Patches/0482-Fix-Chunk-Post-Processing-deadlock-risk.patch +++ b/Spigot-Server-Patches/0482-Fix-Chunk-Post-Processing-deadlock-risk.patch @@ -1,4 +1,4 @@ -From 4922e0520435d838eabc020f440b9c95e7e4b0de Mon Sep 17 00:00:00 2001 +From a025fb60fcd97d4a39b9d65319df173c3bc7cbb5 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sat, 18 Apr 2020 04:36:11 -0400 Subject: [PATCH] Fix Chunk Post Processing deadlock risk @@ -25,7 +25,7 @@ This successfully fixed a reoccurring and highly reproduceable crash for heightmaps. diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java -index 8f4d4f2283..e63333fcab 100644 +index c2e4e4f6f1..78a8a3cc68 100644 --- a/src/main/java/net/minecraft/server/ChunkProviderServer.java +++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java @@ -1048,6 +1048,7 @@ public class ChunkProviderServer extends IChunkProvider { @@ -37,7 +37,7 @@ index 8f4d4f2283..e63333fcab 100644 } // CraftBukkit end diff --git a/src/main/java/net/minecraft/server/PlayerChunkMap.java b/src/main/java/net/minecraft/server/PlayerChunkMap.java -index 0de3f6029c..f5a28e9322 100644 +index 6fa70eb08d..0e652625bb 100644 --- a/src/main/java/net/minecraft/server/PlayerChunkMap.java +++ b/src/main/java/net/minecraft/server/PlayerChunkMap.java @@ -108,6 +108,8 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d { diff --git a/Spigot-Server-Patches/0483-Don-t-crash-if-player-is-attempted-to-be-removed-fro.patch b/Spigot-Server-Patches/0483-Don-t-crash-if-player-is-attempted-to-be-removed-fro.patch index bf7c2b0161..957d625e68 100644 --- a/Spigot-Server-Patches/0483-Don-t-crash-if-player-is-attempted-to-be-removed-fro.patch +++ b/Spigot-Server-Patches/0483-Don-t-crash-if-player-is-attempted-to-be-removed-fro.patch @@ -1,4 +1,4 @@ -From 0502654628ce7f4128d9f3cd5b68e54918007250 Mon Sep 17 00:00:00 2001 +From fcd5f0fd7d20df79af0cccf4623690d8d8ecb9fa Mon Sep 17 00:00:00 2001 From: Aikar Date: Sat, 18 Apr 2020 15:59:41 -0400 Subject: [PATCH] Don't crash if player is attempted to be removed from @@ -7,7 +7,7 @@ Subject: [PATCH] Don't crash if player is attempted to be removed from I suspect it deals with teleporting as it uses players current x/y/z diff --git a/src/main/java/net/minecraft/server/ChunkMapDistance.java b/src/main/java/net/minecraft/server/ChunkMapDistance.java -index 0244768f..279c7a85 100644 +index 0244768f76..279c7a85fb 100644 --- a/src/main/java/net/minecraft/server/ChunkMapDistance.java +++ b/src/main/java/net/minecraft/server/ChunkMapDistance.java @@ -226,6 +226,7 @@ public abstract class ChunkMapDistance { @@ -19,5 +19,5 @@ index 0244768f..279c7a85 100644 objectset.remove(entityplayer); if (objectset.isEmpty()) { -- -2.25.1.windows.1 +2.26.2 diff --git a/Spigot-Server-Patches/0484-Broadcast-join-message-to-console.patch b/Spigot-Server-Patches/0484-Broadcast-join-message-to-console.patch index 5e96a02fd7..49fda7f761 100644 --- a/Spigot-Server-Patches/0484-Broadcast-join-message-to-console.patch +++ b/Spigot-Server-Patches/0484-Broadcast-join-message-to-console.patch @@ -1,11 +1,11 @@ -From c1cf9dd2c6c5cee90fd8b460d721352f9d56a4b9 Mon Sep 17 00:00:00 2001 +From b6e6c288e775adbeab66961a5c9ec0dc48161017 Mon Sep 17 00:00:00 2001 From: AvrooVulcan Date: Fri, 17 Apr 2020 00:15:23 +0100 Subject: [PATCH] Broadcast join message to console diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java -index 160476fa..7403be0b 100644 +index 160476fa29..7403be0b25 100644 --- a/src/main/java/net/minecraft/server/PlayerList.java +++ b/src/main/java/net/minecraft/server/PlayerList.java @@ -186,9 +186,9 @@ public abstract class PlayerList { @@ -22,5 +22,5 @@ index 160476fa..7403be0b 100644 // CraftBukkit end -- -2.25.1.windows.1 +2.26.2 diff --git a/Spigot-Server-Patches/0485-Fix-Longstanding-Broken-behavior-of-PlayerJoinEvent.patch b/Spigot-Server-Patches/0485-Fix-Longstanding-Broken-behavior-of-PlayerJoinEvent.patch index 7c2487dd42..996ef81651 100644 --- a/Spigot-Server-Patches/0485-Fix-Longstanding-Broken-behavior-of-PlayerJoinEvent.patch +++ b/Spigot-Server-Patches/0485-Fix-Longstanding-Broken-behavior-of-PlayerJoinEvent.patch @@ -1,4 +1,4 @@ -From 86c75a3c0ae4e295e196d3faf1e43f12e9f10782 Mon Sep 17 00:00:00 2001 +From eb15a2a2808a32c82fc667b90b4b639aefab097a Mon Sep 17 00:00:00 2001 From: Aikar Date: Sun, 19 Apr 2020 00:05:46 -0400 Subject: [PATCH] Fix Longstanding Broken behavior of PlayerJoinEvent @@ -28,7 +28,7 @@ receives a deterministic result, and should no longer require 1 tick delays anymore. diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java -index f3928b8f6f..686fd4cbad 100644 +index c108a38018..a48e113b53 100644 --- a/src/main/java/net/minecraft/server/EntityPlayer.java +++ b/src/main/java/net/minecraft/server/EntityPlayer.java @@ -104,6 +104,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting { @@ -40,7 +40,7 @@ index f3928b8f6f..686fd4cbad 100644 // CraftBukkit end public PlayerNaturallySpawnCreaturesEvent playerNaturallySpawnedEvent; // Paper diff --git a/src/main/java/net/minecraft/server/PlayerChunkMap.java b/src/main/java/net/minecraft/server/PlayerChunkMap.java -index f5a28e9322..9425b36403 100644 +index 0e652625bb..3f4a3205a4 100644 --- a/src/main/java/net/minecraft/server/PlayerChunkMap.java +++ b/src/main/java/net/minecraft/server/PlayerChunkMap.java @@ -1569,6 +1569,7 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d { diff --git a/Spigot-Server-Patches/0486-Load-Chunks-for-Login-Asynchronously.patch b/Spigot-Server-Patches/0486-Load-Chunks-for-Login-Asynchronously.patch index 1240312e3f..575aba7ba7 100644 --- a/Spigot-Server-Patches/0486-Load-Chunks-for-Login-Asynchronously.patch +++ b/Spigot-Server-Patches/0486-Load-Chunks-for-Login-Asynchronously.patch @@ -1,4 +1,4 @@ -From 0593226cf73df0cf943f0ddc4090dde945e70265 Mon Sep 17 00:00:00 2001 +From 8a70af59fcb23c04a33296165224d604fdbf692e Mon Sep 17 00:00:00 2001 From: Aikar Date: Sun, 19 Apr 2020 04:28:29 -0400 Subject: [PATCH] Load Chunks for Login Asynchronously diff --git a/Spigot-Server-Patches/0487-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch b/Spigot-Server-Patches/0487-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch index a727b664f7..9d84ac4332 100644 --- a/Spigot-Server-Patches/0487-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch +++ b/Spigot-Server-Patches/0487-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch @@ -1,4 +1,4 @@ -From 1accce90bb7471c5d7aeb41ae2f19943e291f6cf Mon Sep 17 00:00:00 2001 +From 04f833aace5e4d08766d9cff78d6e83b5e92dfad Mon Sep 17 00:00:00 2001 From: 2277 <38501234+2277@users.noreply.github.com> Date: Tue, 31 Mar 2020 10:33:55 +0100 Subject: [PATCH] Move player to spawn point if spawn in unloaded world @@ -7,7 +7,7 @@ The code following this has better support for null worlds to move them back to the world spawn. diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java -index 96a47dd1..46e631d4 100644 +index 01330045c0..9bb5a4bcf1 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java @@ -1790,9 +1790,11 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke @@ -26,5 +26,5 @@ index 96a47dd1..46e631d4 100644 spawnIn(bworld == null ? null : ((CraftWorld) bworld).getHandle()); } -- -2.25.1.windows.1 +2.26.2 diff --git a/Spigot-Server-Patches/0488-Allow-sleeping-players-to-float.patch b/Spigot-Server-Patches/0488-Allow-sleeping-players-to-float.patch index 855ecd8f7a..c882d99ef3 100644 --- a/Spigot-Server-Patches/0488-Allow-sleeping-players-to-float.patch +++ b/Spigot-Server-Patches/0488-Allow-sleeping-players-to-float.patch @@ -1,4 +1,4 @@ -From 12534ede5c4556d34e7e207fb7970b92b7ead475 Mon Sep 17 00:00:00 2001 +From b05ea81f6deb2f2d7fcc6fb65e371bd7402e2df1 Mon Sep 17 00:00:00 2001 From: Mariell Hoversholm Date: Sun, 19 Apr 2020 12:25:20 +0200 Subject: [PATCH] Allow sleeping players to float diff --git a/Spigot-Server-Patches/0489-Add-PlayerAttackEntityCooldownResetEvent.patch b/Spigot-Server-Patches/0489-Add-PlayerAttackEntityCooldownResetEvent.patch index 9576c6239d..7de6a467d4 100644 --- a/Spigot-Server-Patches/0489-Add-PlayerAttackEntityCooldownResetEvent.patch +++ b/Spigot-Server-Patches/0489-Add-PlayerAttackEntityCooldownResetEvent.patch @@ -1,4 +1,4 @@ -From c747a7f040b85df3dc2461f55587064e691fab9b Mon Sep 17 00:00:00 2001 +From 57f07c3d690df1b2b2b613dea2e368984ee4b9fb Mon Sep 17 00:00:00 2001 From: nossr50 Date: Thu, 26 Mar 2020 19:44:50 -0700 Subject: [PATCH] Add PlayerAttackEntityCooldownResetEvent diff --git a/Spigot-Server-Patches/0490-Allow-multiple-callbacks-to-schedule-for-Callback-Ex.patch b/Spigot-Server-Patches/0490-Allow-multiple-callbacks-to-schedule-for-Callback-Ex.patch index 06a4dd14e7..88485dd68f 100644 --- a/Spigot-Server-Patches/0490-Allow-multiple-callbacks-to-schedule-for-Callback-Ex.patch +++ b/Spigot-Server-Patches/0490-Allow-multiple-callbacks-to-schedule-for-Callback-Ex.patch @@ -1,4 +1,4 @@ -From 74c25fa52e0597b02faef91663c35c1279a33369 Mon Sep 17 00:00:00 2001 +From 759d5945b448b510250dc35d4c72d2d90c51cfa4 Mon Sep 17 00:00:00 2001 From: Aikar Date: Tue, 21 Apr 2020 03:51:53 -0400 Subject: [PATCH] Allow multiple callbacks to schedule for Callback Executor @@ -14,7 +14,7 @@ Use an ArrayDeque to store this Queue We make sure to also implement a pattern that is recursion safe too. diff --git a/src/main/java/net/minecraft/server/PlayerChunkMap.java b/src/main/java/net/minecraft/server/PlayerChunkMap.java -index 2ea06224f3..99b490374d 100644 +index 3f4a3205a4..aabb9220db 100644 --- a/src/main/java/net/minecraft/server/PlayerChunkMap.java +++ b/src/main/java/net/minecraft/server/PlayerChunkMap.java @@ -87,24 +87,32 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d { diff --git a/Spigot-Server-Patches/0491-Don-t-fire-BlockFade-on-worldgen-threads.patch b/Spigot-Server-Patches/0491-Don-t-fire-BlockFade-on-worldgen-threads.patch index cb302c0067..502fc12765 100644 --- a/Spigot-Server-Patches/0491-Don-t-fire-BlockFade-on-worldgen-threads.patch +++ b/Spigot-Server-Patches/0491-Don-t-fire-BlockFade-on-worldgen-threads.patch @@ -1,4 +1,4 @@ -From 492da5a6f36c3344dccb916e62ddf9968c2e5f2e Mon Sep 17 00:00:00 2001 +From d4c9271457c31e20ca2245fcc187e3032eff10d2 Mon Sep 17 00:00:00 2001 From: Aikar Date: Thu, 23 Apr 2020 01:36:39 -0400 Subject: [PATCH] Don't fire BlockFade on worldgen threads @@ -18,5 +18,5 @@ index b41de95a63..9e501514f3 100644 CraftBlockState blockState = CraftBlockState.getBlockState(generatoraccess, blockposition); blockState.setData(Blocks.AIR.getBlockData()); -- -2.25.1 +2.26.2 diff --git a/Spigot-Server-Patches/0492-Add-phantom-creative-and-insomniac-controls.patch b/Spigot-Server-Patches/0492-Add-phantom-creative-and-insomniac-controls.patch index 5ee5d9b1f5..786133fd1f 100644 --- a/Spigot-Server-Patches/0492-Add-phantom-creative-and-insomniac-controls.patch +++ b/Spigot-Server-Patches/0492-Add-phantom-creative-and-insomniac-controls.patch @@ -1,11 +1,11 @@ -From ccfe2eb5f9335efb094f08aed5c57895314674b5 Mon Sep 17 00:00:00 2001 +From be90753baac2d3f3f7548c3d1757dc2ef772506e Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Sat, 25 Apr 2020 15:13:41 -0500 Subject: [PATCH] Add phantom creative and insomniac controls diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index 88a45e517..fc189ebc9 100644 +index 88a45e517c..fc189ebc96 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java @@ -689,4 +689,11 @@ public class PaperWorldConfig { @@ -21,7 +21,7 @@ index 88a45e517..fc189ebc9 100644 + } } diff --git a/src/main/java/net/minecraft/server/EntityPhantom.java b/src/main/java/net/minecraft/server/EntityPhantom.java -index 90eeddb1a..96b4912c4 100644 +index 90eeddb1af..96b4912c48 100644 --- a/src/main/java/net/minecraft/server/EntityPhantom.java +++ b/src/main/java/net/minecraft/server/EntityPhantom.java @@ -232,6 +232,7 @@ public class EntityPhantom extends EntityFlying implements IMonster { @@ -33,7 +33,7 @@ index 90eeddb1a..96b4912c4 100644 return true; } diff --git a/src/main/java/net/minecraft/server/IEntitySelector.java b/src/main/java/net/minecraft/server/IEntitySelector.java -index a2d1ef360..1398c47a2 100644 +index a2d1ef3602..1398c47a2f 100644 --- a/src/main/java/net/minecraft/server/IEntitySelector.java +++ b/src/main/java/net/minecraft/server/IEntitySelector.java @@ -23,6 +23,7 @@ public final class IEntitySelector { @@ -45,7 +45,7 @@ index a2d1ef360..1398c47a2 100644 public static Predicate a(double d0, double d1, double d2, double d3) { double d4 = d3 * d3; diff --git a/src/main/java/net/minecraft/server/MobSpawnerPhantom.java b/src/main/java/net/minecraft/server/MobSpawnerPhantom.java -index f488c22ed..0db431cd6 100644 +index f488c22ed6..0db431cd6a 100644 --- a/src/main/java/net/minecraft/server/MobSpawnerPhantom.java +++ b/src/main/java/net/minecraft/server/MobSpawnerPhantom.java @@ -31,7 +31,7 @@ public class MobSpawnerPhantom { @@ -58,5 +58,5 @@ index f488c22ed..0db431cd6 100644 if (!worldserver.worldProvider.f() || blockposition.getY() >= worldserver.getSeaLevel() && worldserver.f(blockposition)) { -- -2.24.0 +2.26.2 diff --git a/Spigot-Server-Patches/0493-Fix-numerous-item-duplication-issues-and-teleport-is.patch b/Spigot-Server-Patches/0493-Fix-numerous-item-duplication-issues-and-teleport-is.patch index e0952d1eb1..82d8e61119 100644 --- a/Spigot-Server-Patches/0493-Fix-numerous-item-duplication-issues-and-teleport-is.patch +++ b/Spigot-Server-Patches/0493-Fix-numerous-item-duplication-issues-and-teleport-is.patch @@ -1,4 +1,4 @@ -From 822d4a3f9ffd66b16f3c2180576e6b0c646567ae Mon Sep 17 00:00:00 2001 +From 93db05c5d0cdd9759162cf22844ab6801120ebd9 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sat, 25 Apr 2020 06:46:35 -0400 Subject: [PATCH] Fix numerous item duplication issues and teleport issues @@ -79,10 +79,10 @@ index 8ad131e4fc..d35a0b2d94 100644 } } diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -index 82a70a83b2..88cdb0d8a1 100644 +index c3f7e46121..b0942e88e1 100644 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -@@ -769,7 +769,8 @@ public class CraftEventFactory { +@@ -776,7 +776,8 @@ public class CraftEventFactory { for (org.bukkit.inventory.ItemStack stack : event.getDrops()) { if (stack == null || stack.getType() == Material.AIR || stack.getAmount() == 0) continue; diff --git a/Spigot-Server-Patches/0494-Implement-Brigadier-Mojang-API.patch b/Spigot-Server-Patches/0494-Implement-Brigadier-Mojang-API.patch index 3d6b7e4ca2..f6813780bf 100644 --- a/Spigot-Server-Patches/0494-Implement-Brigadier-Mojang-API.patch +++ b/Spigot-Server-Patches/0494-Implement-Brigadier-Mojang-API.patch @@ -1,4 +1,4 @@ -From bdb2c31298c1b905485d70aa0e4a09841fd38023 Mon Sep 17 00:00:00 2001 +From c6d1d92f36b8a4031a470e690908abe589ca58d8 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sun, 19 Apr 2020 18:15:29 -0400 Subject: [PATCH] Implement Brigadier Mojang API diff --git a/Spigot-Server-Patches/0495-Villager-Restocks-API.patch b/Spigot-Server-Patches/0495-Villager-Restocks-API.patch index 641032ca46..a86cce5d8b 100644 --- a/Spigot-Server-Patches/0495-Villager-Restocks-API.patch +++ b/Spigot-Server-Patches/0495-Villager-Restocks-API.patch @@ -1,11 +1,11 @@ -From 9b079b5a2e9a2b894dae9a6b4643fd033f9b14ad Mon Sep 17 00:00:00 2001 +From 6a37d7c6bd64ccfbb2d061af1cabb3c64b0cef8c Mon Sep 17 00:00:00 2001 From: zbk Date: Sun, 26 Apr 2020 23:49:01 -0400 Subject: [PATCH] Villager Restocks API diff --git a/src/main/java/net/minecraft/server/EntityVillager.java b/src/main/java/net/minecraft/server/EntityVillager.java -index 6e0020ae..ef2ee68c 100644 +index 6e0020ae0b..ef2ee68cd6 100644 --- a/src/main/java/net/minecraft/server/EntityVillager.java +++ b/src/main/java/net/minecraft/server/EntityVillager.java @@ -977,4 +977,13 @@ public class EntityVillager extends EntityVillagerAbstract implements Reputation @@ -23,7 +23,7 @@ index 6e0020ae..ef2ee68c 100644 + // Paper end } diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftVillager.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftVillager.java -index a73ebaa7..a12d8711 100644 +index fe726e7884..a8384081c0 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftVillager.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftVillager.java @@ -82,6 +82,18 @@ public class CraftVillager extends CraftAbstractVillager implements Villager { @@ -46,5 +46,5 @@ index a73ebaa7..a12d8711 100644 public boolean sleep(Location location) { Preconditions.checkArgument(location != null, "Location cannot be null"); -- -2.25.0.windows.1 +2.26.2 diff --git a/Spigot-Server-Patches/0496-Fix-commodore-by-updating-asm.patch b/Spigot-Server-Patches/0496-Fix-commodore-by-updating-asm.patch index f791fbf0f2..f926250faa 100644 --- a/Spigot-Server-Patches/0496-Fix-commodore-by-updating-asm.patch +++ b/Spigot-Server-Patches/0496-Fix-commodore-by-updating-asm.patch @@ -1,4 +1,4 @@ -From 5bf972ff3a595f6822a73ceec02e48a19848ec40 Mon Sep 17 00:00:00 2001 +From fc0872e1d7d932dd86557d11134fd650901a0ca9 Mon Sep 17 00:00:00 2001 From: MiniDigger Date: Thu, 30 Apr 2020 16:17:14 +0200 Subject: [PATCH] Fix commodore by updating asm @@ -31,5 +31,5 @@ index 2c6814f131..4ae41fd255 100644 // Paper start - Rewrite plugins @Override -- -2.26.1 +2.26.2 diff --git a/paper b/paper index 268cc02a76..99d41654cb 100755 --- a/paper +++ b/paper @@ -36,6 +36,13 @@ case "$1" in scripts/rebuildPatches.sh "$basedir" $2 || exit 1 ) || failed=1 ;; + "rbf" | "rbfull") + ( + set -e + cd "$basedir" + scripts/rebuildPatches.sh "$basedir" "nofilter" || exit 1 + ) || failed=1 + ;; "p" | "patch") ( set -e diff --git a/work/Bukkit b/work/Bukkit index 220bc59467..b999860d43 160000 --- a/work/Bukkit +++ b/work/Bukkit @@ -1 +1 @@ -Subproject commit 220bc5946757e81379fed13097dbaa386c823381 +Subproject commit b999860d432f4ba1bc70c6b5a18918fd43716165 diff --git a/work/CraftBukkit b/work/CraftBukkit index 893ad93b3e..77fd87e4d0 160000 --- a/work/CraftBukkit +++ b/work/CraftBukkit @@ -1 +1 @@ -Subproject commit 893ad93b3eb6d81b338cdc5850cdb6bbea6af95f +Subproject commit 77fd87e4d053a82b1a733a773b235c25c2a6c6a7