diff --git a/Spigot-API-Patches/0001-POM-changes.patch b/Spigot-API-Patches/0001-POM-changes.patch index 3b91071dfd..8186d334d2 100644 --- a/Spigot-API-Patches/0001-POM-changes.patch +++ b/Spigot-API-Patches/0001-POM-changes.patch @@ -1,4 +1,4 @@ -From 6c376546c6b7ad08a3b414f705e54015f4b0200f Mon Sep 17 00:00:00 2001 +From b3e029c256e793171b8e2944cf70605421487858 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/Spigot-API-Patches/0002-Add-FastUtil-to-Bukkit.patch b/Spigot-API-Patches/0002-Add-FastUtil-to-Bukkit.patch index 33508d5315..0fac8cd12f 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 ba48d41f6fb7072f60e80b0bf683b3f1650b2aeb Mon Sep 17 00:00:00 2001 +From 12e0d1a8dbc8180bd231739a3970f6d4faea9329 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 69866193..3dac66d3 100644 +index 2a2abac96..81851a293 100644 --- a/pom.xml +++ b/pom.xml @@ -50,6 +50,12 @@ diff --git a/Spigot-API-Patches/0003-Paper-Utils.patch b/Spigot-API-Patches/0003-Paper-Utils.patch index 353d2b5e3c..7eca0663cc 100644 --- a/Spigot-API-Patches/0003-Paper-Utils.patch +++ b/Spigot-API-Patches/0003-Paper-Utils.patch @@ -1,4 +1,4 @@ -From 291dddb5395e33cdfdc58142296dcc5e8aba73f0 Mon Sep 17 00:00:00 2001 +From d19655d8222dc11620e19634a04e10b2ef5d8ea3 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sat, 23 Feb 2019 11:26:21 -0500 Subject: [PATCH] Paper Utils @@ -6,7 +6,7 @@ Subject: [PATCH] Paper Utils diff --git a/src/main/java/com/destroystokyo/paper/util/SneakyThrow.java b/src/main/java/com/destroystokyo/paper/util/SneakyThrow.java new file mode 100644 -index 00000000..9db0056a +index 000000000..9db0056ab --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/util/SneakyThrow.java @@ -0,0 +1,16 @@ diff --git a/Spigot-API-Patches/0004-Timings-v2.patch b/Spigot-API-Patches/0004-Timings-v2.patch index a3087735c2..b80c3bb69f 100644 --- a/Spigot-API-Patches/0004-Timings-v2.patch +++ b/Spigot-API-Patches/0004-Timings-v2.patch @@ -1,4 +1,4 @@ -From 64d9488334e3b3e421967247c570baeaff171002 Mon Sep 17 00:00:00 2001 +From d8cc95839c35574bfdfc10f178092c6c299bdc96 Mon Sep 17 00:00:00 2001 From: Aikar Date: Mon, 29 Feb 2016 18:48:17 -0600 Subject: [PATCH] Timings v2 diff --git a/Spigot-API-Patches/0005-Player-affects-spawning-API.patch b/Spigot-API-Patches/0005-Player-affects-spawning-API.patch index db0d1f853f..a65eb15bfe 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 ff975211888a6278bff7825a05c0570c40a5572d Mon Sep 17 00:00:00 2001 +From 457706162404fe59372fb8faa3240e9cd5d5eb92 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 diff --git a/Spigot-API-Patches/0006-Add-getTPS-method.patch b/Spigot-API-Patches/0006-Add-getTPS-method.patch index f34d8cc9b9..4be3aa813f 100644 --- a/Spigot-API-Patches/0006-Add-getTPS-method.patch +++ b/Spigot-API-Patches/0006-Add-getTPS-method.patch @@ -1,11 +1,11 @@ -From 3dc036320c5c47452a57756953fb08f509c98008 Mon Sep 17 00:00:00 2001 +From 2add78cba99e477862cf447e11d02e4df0e5795b Mon Sep 17 00:00:00 2001 From: Aikar Date: Mon, 29 Feb 2016 17:24:57 -0600 Subject: [PATCH] Add getTPS method diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java -index 940c643d..9f87f333 100644 +index 940c643df..9f87f333e 100644 --- a/src/main/java/org/bukkit/Bukkit.java +++ b/src/main/java/org/bukkit/Bukkit.java @@ -1311,6 +1311,17 @@ public final class Bukkit { @@ -27,7 +27,7 @@ index 940c643d..9f87f333 100644 * Get the advancement specified by this key. * diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java -index c197e381..e1dfa92a 100644 +index c197e3811..e1dfa92a9 100644 --- a/src/main/java/org/bukkit/Server.java +++ b/src/main/java/org/bukkit/Server.java @@ -1096,6 +1096,16 @@ public interface Server extends PluginMessageRecipient { diff --git a/Spigot-API-Patches/0007-Entity-Origin-API.patch b/Spigot-API-Patches/0007-Entity-Origin-API.patch index d611952254..abe6b32b38 100644 --- a/Spigot-API-Patches/0007-Entity-Origin-API.patch +++ b/Spigot-API-Patches/0007-Entity-Origin-API.patch @@ -1,11 +1,11 @@ -From 8afe5fdd42c40fbe3abb9fbae80e154fd896f4d7 Mon Sep 17 00:00:00 2001 +From 13cf66cb0e08d0cfd3698a607cb0de052992b480 Mon Sep 17 00:00:00 2001 From: Byteflux Date: Mon, 29 Feb 2016 17:50:31 -0600 Subject: [PATCH] Entity Origin API diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java -index 699c31d9..c8439d64 100644 +index 699c31d97..c8439d644 100644 --- a/src/main/java/org/bukkit/entity/Entity.java +++ b/src/main/java/org/bukkit/entity/Entity.java @@ -606,4 +606,16 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent @@ -26,7 +26,7 @@ index 699c31d9..c8439d64 100644 + // Paper end } diff --git a/src/main/java/org/bukkit/entity/FallingBlock.java b/src/main/java/org/bukkit/entity/FallingBlock.java -index 64f9d3fd..14cb0d77 100644 +index 64f9d3fd8..14cb0d770 100644 --- a/src/main/java/org/bukkit/entity/FallingBlock.java +++ b/src/main/java/org/bukkit/entity/FallingBlock.java @@ -54,4 +54,15 @@ public interface FallingBlock extends Entity { @@ -46,7 +46,7 @@ index 64f9d3fd..14cb0d77 100644 + } } diff --git a/src/main/java/org/bukkit/entity/TNTPrimed.java b/src/main/java/org/bukkit/entity/TNTPrimed.java -index 5a878932..3022b4a2 100644 +index 5a8789324..3022b4a27 100644 --- a/src/main/java/org/bukkit/entity/TNTPrimed.java +++ b/src/main/java/org/bukkit/entity/TNTPrimed.java @@ -39,4 +39,15 @@ public interface TNTPrimed extends Explosive { diff --git a/Spigot-API-Patches/0008-Version-Command-2.0.patch b/Spigot-API-Patches/0008-Version-Command-2.0.patch index 25fe82f9a0..e8f362b6f8 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 b96066e41b3d03c005b1e571dd042769b787725c Mon Sep 17 00:00:00 2001 +From 552986e5dd52cbe6524baa2fe47b634f50500a89 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 @@ -6,7 +6,7 @@ Subject: [PATCH] Version Command 2.0 diff --git a/src/main/java/com/destroystokyo/paper/util/VersionFetcher.java b/src/main/java/com/destroystokyo/paper/util/VersionFetcher.java new file mode 100644 -index 00000000..2a265129 +index 000000000..2a2651299 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/util/VersionFetcher.java @@ -0,0 +1,44 @@ @@ -55,7 +55,7 @@ index 00000000..2a265129 + } +} diff --git a/src/main/java/org/bukkit/UnsafeValues.java b/src/main/java/org/bukkit/UnsafeValues.java -index 72c5501e..c0ff133d 100644 +index 72c5501e8..c0ff133de 100644 --- a/src/main/java/org/bukkit/UnsafeValues.java +++ b/src/main/java/org/bukkit/UnsafeValues.java @@ -76,5 +76,12 @@ public interface UnsafeValues { @@ -72,7 +72,7 @@ index 72c5501e..c0ff133d 100644 // Paper end } diff --git a/src/main/java/org/bukkit/command/defaults/VersionCommand.java b/src/main/java/org/bukkit/command/defaults/VersionCommand.java -index cbce5244..0486abd1 100644 +index cbce52444..0486abd19 100644 --- a/src/main/java/org/bukkit/command/defaults/VersionCommand.java +++ b/src/main/java/org/bukkit/command/defaults/VersionCommand.java @@ -1,5 +1,6 @@ diff --git a/Spigot-API-Patches/0009-Add-PlayerLocaleChangeEvent.patch b/Spigot-API-Patches/0009-Add-PlayerLocaleChangeEvent.patch index 7afb2fd966..89d462e6a0 100644 --- a/Spigot-API-Patches/0009-Add-PlayerLocaleChangeEvent.patch +++ b/Spigot-API-Patches/0009-Add-PlayerLocaleChangeEvent.patch @@ -1,4 +1,4 @@ -From 9a6838df086b3cfe02bc73770d02dffc80458b6e Mon Sep 17 00:00:00 2001 +From 6a8f23c6b0bd02d204456cd2460b5e2c65a90c2c Mon Sep 17 00:00:00 2001 From: Isaac Moore Date: Mon, 29 Feb 2016 18:02:25 -0600 Subject: [PATCH] Add PlayerLocaleChangeEvent @@ -6,7 +6,7 @@ Subject: [PATCH] Add PlayerLocaleChangeEvent diff --git a/src/main/java/com/destroystokyo/paper/event/player/PlayerLocaleChangeEvent.java b/src/main/java/com/destroystokyo/paper/event/player/PlayerLocaleChangeEvent.java new file mode 100644 -index 00000000..29dd763a +index 000000000..29dd763a9 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/event/player/PlayerLocaleChangeEvent.java @@ -0,0 +1,50 @@ 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 450c09fc9b..8262fcf095 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 18b67ec34070205553c5d37eb7fa10a49f8326e4 Mon Sep 17 00:00:00 2001 +From be074334b42c57876a13779e7d33b74087bdf90a 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 diff --git a/Spigot-API-Patches/0011-Add-BeaconEffectEvent.patch b/Spigot-API-Patches/0011-Add-BeaconEffectEvent.patch index b4bacf5556..47627b6771 100644 --- a/Spigot-API-Patches/0011-Add-BeaconEffectEvent.patch +++ b/Spigot-API-Patches/0011-Add-BeaconEffectEvent.patch @@ -1,4 +1,4 @@ -From 0d98bd24755cdde12f818cae59c8fd062416f45a Mon Sep 17 00:00:00 2001 +From 49159b8720dbfeed57b0a553bdc90a044577f508 Mon Sep 17 00:00:00 2001 From: Byteflux Date: Mon, 29 Feb 2016 18:09:40 -0600 Subject: [PATCH] Add BeaconEffectEvent @@ -6,7 +6,7 @@ Subject: [PATCH] Add BeaconEffectEvent diff --git a/src/main/java/com/destroystokyo/paper/event/block/BeaconEffectEvent.java b/src/main/java/com/destroystokyo/paper/event/block/BeaconEffectEvent.java new file mode 100644 -index 00000000..978813b9 +index 000000000..978813b94 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/event/block/BeaconEffectEvent.java @@ -0,0 +1,86 @@ diff --git a/Spigot-API-Patches/0012-Add-PlayerInitialSpawnEvent.patch b/Spigot-API-Patches/0012-Add-PlayerInitialSpawnEvent.patch index 5f97606715..878c15a18b 100644 --- a/Spigot-API-Patches/0012-Add-PlayerInitialSpawnEvent.patch +++ b/Spigot-API-Patches/0012-Add-PlayerInitialSpawnEvent.patch @@ -1,4 +1,4 @@ -From 7e4486b3102224a0c88366432cac3e6ef83bbd71 Mon Sep 17 00:00:00 2001 +From 5947dd372dfe23c64bbd20643438803e3cbed487 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..8e407eff +index 000000000..8e407eff1 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/event/player/PlayerInitialSpawnEvent.java @@ -0,0 +1,47 @@ 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 136f1a45bc..b64d3ecb54 100644 --- a/Spigot-API-Patches/0013-Automatically-disable-plugins-that-fail-to-load.patch +++ b/Spigot-API-Patches/0013-Automatically-disable-plugins-that-fail-to-load.patch @@ -1,11 +1,11 @@ -From d52d23e3b9da885c5a0209ad2a8a00afb2d78b6c Mon Sep 17 00:00:00 2001 +From 70633c7b9d25cdbfb631d999b307ef447a1ed579 Mon Sep 17 00:00:00 2001 From: Aikar Date: Mon, 29 Feb 2016 19:45:21 -0600 Subject: [PATCH] Automatically disable plugins that fail to load diff --git a/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java b/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java -index 82e379d1..12601db6 100644 +index 82e379d16..12601db68 100644 --- a/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java +++ b/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java @@ -345,6 +345,10 @@ public final class JavaPluginLoader implements PluginLoader { diff --git a/Spigot-API-Patches/0014-Expose-server-CommandMap.patch b/Spigot-API-Patches/0014-Expose-server-CommandMap.patch index 79c072cfbf..d8e804c4b9 100644 --- a/Spigot-API-Patches/0014-Expose-server-CommandMap.patch +++ b/Spigot-API-Patches/0014-Expose-server-CommandMap.patch @@ -1,11 +1,11 @@ -From 3a982ed3a1fb226be1a1a7cc29f0aa77a91e6c8b Mon Sep 17 00:00:00 2001 +From 9922d188f075c2604ee0b1ccbebba38b3c11a2ea Mon Sep 17 00:00:00 2001 From: kashike Date: Mon, 29 Feb 2016 19:48:59 -0600 Subject: [PATCH] Expose server CommandMap diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java -index 9f87f333..63e48ef3 100644 +index 9f87f333e..63e48ef3f 100644 --- a/src/main/java/org/bukkit/Bukkit.java +++ b/src/main/java/org/bukkit/Bukkit.java @@ -1485,6 +1485,19 @@ public final class Bukkit { @@ -29,7 +29,7 @@ index 9f87f333..63e48ef3 100644 public static Server.Spigot spigot() { diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java -index e1dfa92a..87300a5d 100644 +index e1dfa92a9..87300a5df 100644 --- a/src/main/java/org/bukkit/Server.java +++ b/src/main/java/org/bukkit/Server.java @@ -1106,6 +1106,15 @@ public interface Server extends PluginMessageRecipient { 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 f5c53679e4..fea6ff6f61 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 b4534cdb384942daeea67ad698853dfd6749381f Mon Sep 17 00:00:00 2001 +From 305a20b026e6e844fe28e5c2b33643f41a836f52 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 @@ -6,7 +6,7 @@ Subject: [PATCH] Graduate bungeecord chat API from spigot subclasses Change Javadoc to be accurate diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java -index e4e1c980..3c76d5a8 100644 +index 63e48ef3f..b92304e9b 100644 --- a/src/main/java/org/bukkit/Bukkit.java +++ b/src/main/java/org/bukkit/Bukkit.java @@ -274,6 +274,26 @@ public final class Bukkit { @@ -37,7 +37,7 @@ index e4e1c980..3c76d5a8 100644 * Gets the name of the update folder. The update folder is used to safely * update plugins at the right moment on a plugin load. diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java -index f0850919..3359434b 100644 +index 87300a5df..d35d2deff 100644 --- a/src/main/java/org/bukkit/Server.java +++ b/src/main/java/org/bukkit/Server.java @@ -225,6 +225,26 @@ public interface Server extends PluginMessageRecipient { @@ -68,7 +68,7 @@ index f0850919..3359434b 100644 * Gets the name of the update folder. The update folder is used to safely * update plugins at the right moment on a plugin load. diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java -index 145c78c2..bc4ec3f2 100644 +index 338d47205..8b5340a1f 100644 --- a/src/main/java/org/bukkit/entity/Player.java +++ b/src/main/java/org/bukkit/entity/Player.java @@ -421,6 +421,38 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM 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 993f52b01a..d1f1f7b375 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 930766c10632a6483c6a44cfc9c08564571e880a Mon Sep 17 00:00:00 2001 +From 1a8f1a783d9615e8e45ff89fa5b88d6c72619992 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 @@ -6,7 +6,7 @@ Subject: [PATCH] Player Tab List and Title APIs diff --git a/src/main/java/com/destroystokyo/paper/Title.java b/src/main/java/com/destroystokyo/paper/Title.java new file mode 100644 -index 00000000..4fe18540 +index 000000000..4fe18540f --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/Title.java @@ -0,0 +1,373 @@ @@ -384,7 +384,7 @@ index 00000000..4fe18540 + } +} diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java -index bc4ec3f2..abe00d72 100644 +index 8b5340a1f..0f7f25eb4 100644 --- a/src/main/java/org/bukkit/entity/Player.java +++ b/src/main/java/org/bukkit/entity/Player.java @@ -1,6 +1,8 @@ diff --git a/Spigot-API-Patches/0017-Add-exception-reporting-event.patch b/Spigot-API-Patches/0017-Add-exception-reporting-event.patch index ac15860ce0..846572b45b 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 4b0e39e1270afcb0a08bc1d74935aa363ee79c56 Mon Sep 17 00:00:00 2001 +From a518f00b42bda3ba162cac421b441dd55d594336 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 @@ -6,7 +6,7 @@ Subject: [PATCH] Add exception reporting event diff --git a/src/main/java/com/destroystokyo/paper/event/server/ServerExceptionEvent.java b/src/main/java/com/destroystokyo/paper/event/server/ServerExceptionEvent.java new file mode 100644 -index 00000000..d3b00f74 +index 000000000..d3b00f741 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/event/server/ServerExceptionEvent.java @@ -0,0 +1,41 @@ @@ -53,7 +53,7 @@ index 00000000..d3b00f74 +} diff --git a/src/main/java/com/destroystokyo/paper/exception/ServerCommandException.java b/src/main/java/com/destroystokyo/paper/exception/ServerCommandException.java new file mode 100644 -index 00000000..6fb39af0 +index 000000000..6fb39af04 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/exception/ServerCommandException.java @@ -0,0 +1,64 @@ @@ -123,7 +123,7 @@ index 00000000..6fb39af0 +} diff --git a/src/main/java/com/destroystokyo/paper/exception/ServerEventException.java b/src/main/java/com/destroystokyo/paper/exception/ServerEventException.java new file mode 100644 -index 00000000..410b2413 +index 000000000..410b24139 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/exception/ServerEventException.java @@ -0,0 +1,52 @@ @@ -181,7 +181,7 @@ index 00000000..410b2413 +} diff --git a/src/main/java/com/destroystokyo/paper/exception/ServerException.java b/src/main/java/com/destroystokyo/paper/exception/ServerException.java new file mode 100644 -index 00000000..c06ea394 +index 000000000..c06ea3942 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/exception/ServerException.java @@ -0,0 +1,23 @@ @@ -210,7 +210,7 @@ index 00000000..c06ea394 +} diff --git a/src/main/java/com/destroystokyo/paper/exception/ServerInternalException.java b/src/main/java/com/destroystokyo/paper/exception/ServerInternalException.java new file mode 100644 -index 00000000..e762ed0d +index 000000000..e762ed0db --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/exception/ServerInternalException.java @@ -0,0 +1,35 @@ @@ -251,7 +251,7 @@ index 00000000..e762ed0d +} diff --git a/src/main/java/com/destroystokyo/paper/exception/ServerPluginEnableDisableException.java b/src/main/java/com/destroystokyo/paper/exception/ServerPluginEnableDisableException.java new file mode 100644 -index 00000000..f016ba3b +index 000000000..f016ba3b1 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/exception/ServerPluginEnableDisableException.java @@ -0,0 +1,20 @@ @@ -278,7 +278,7 @@ index 00000000..f016ba3b \ No newline at end of file diff --git a/src/main/java/com/destroystokyo/paper/exception/ServerPluginException.java b/src/main/java/com/destroystokyo/paper/exception/ServerPluginException.java new file mode 100644 -index 00000000..6defac28 +index 000000000..6defac287 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/exception/ServerPluginException.java @@ -0,0 +1,38 @@ @@ -322,7 +322,7 @@ index 00000000..6defac28 +} diff --git a/src/main/java/com/destroystokyo/paper/exception/ServerPluginMessageException.java b/src/main/java/com/destroystokyo/paper/exception/ServerPluginMessageException.java new file mode 100644 -index 00000000..89e13252 +index 000000000..89e132525 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/exception/ServerPluginMessageException.java @@ -0,0 +1,64 @@ @@ -392,7 +392,7 @@ index 00000000..89e13252 +} diff --git a/src/main/java/com/destroystokyo/paper/exception/ServerSchedulerException.java b/src/main/java/com/destroystokyo/paper/exception/ServerSchedulerException.java new file mode 100644 -index 00000000..2d0b2d4a +index 000000000..2d0b2d4a9 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/exception/ServerSchedulerException.java @@ -0,0 +1,37 @@ @@ -435,7 +435,7 @@ index 00000000..2d0b2d4a +} diff --git a/src/main/java/com/destroystokyo/paper/exception/ServerTabCompleteException.java b/src/main/java/com/destroystokyo/paper/exception/ServerTabCompleteException.java new file mode 100644 -index 00000000..5582999f +index 000000000..5582999fe --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/exception/ServerTabCompleteException.java @@ -0,0 +1,22 @@ @@ -462,7 +462,7 @@ index 00000000..5582999f + } +} diff --git a/src/main/java/org/bukkit/command/SimpleCommandMap.java b/src/main/java/org/bukkit/command/SimpleCommandMap.java -index f020cb04..adfc7aae 100644 +index f020cb04e..adfc7aae2 100644 --- a/src/main/java/org/bukkit/command/SimpleCommandMap.java +++ b/src/main/java/org/bukkit/command/SimpleCommandMap.java @@ -8,6 +8,10 @@ import java.util.HashMap; @@ -504,7 +504,7 @@ index f020cb04..adfc7aae 100644 } diff --git a/src/main/java/org/bukkit/plugin/SimplePluginManager.java b/src/main/java/org/bukkit/plugin/SimplePluginManager.java -index 78a2d2f8..aa0c809a 100644 +index 78a2d2f8d..aa0c809a6 100644 --- a/src/main/java/org/bukkit/plugin/SimplePluginManager.java +++ b/src/main/java/org/bukkit/plugin/SimplePluginManager.java @@ -19,6 +19,10 @@ import java.util.WeakHashMap; 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 9ab6c1fcdf..6498cf96f6 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 f53ab7eff0bd8214cc0185fb8bb9f19f895aa6c9 Mon Sep 17 00:00:00 2001 +From ff164a0952e13e8f262ae0c687f1360c05a8ded7 Mon Sep 17 00:00:00 2001 From: Aikar Date: Mon, 29 Feb 2016 20:26:39 -0600 Subject: [PATCH] Fix ServerListPingEvent flagging as Async @@ -6,7 +6,7 @@ Subject: [PATCH] Fix ServerListPingEvent flagging as Async This event can sometimes fire Async, set the proper boolean diff --git a/src/main/java/org/bukkit/event/server/ServerEvent.java b/src/main/java/org/bukkit/event/server/ServerEvent.java -index 46b11901..05167fb3 100644 +index 46b119017..05167fb34 100644 --- a/src/main/java/org/bukkit/event/server/ServerEvent.java +++ b/src/main/java/org/bukkit/event/server/ServerEvent.java @@ -1,5 +1,6 @@ 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 646d49a79f..331f338291 100644 --- a/Spigot-API-Patches/0019-Add-BaseComponent-sendMessage-methods-to-CommandSend.patch +++ b/Spigot-API-Patches/0019-Add-BaseComponent-sendMessage-methods-to-CommandSend.patch @@ -1,11 +1,11 @@ -From 3060ab89a8aad75f91754407cbe69c61f37d984d Mon Sep 17 00:00:00 2001 +From c774f0ab274852a7b7c425304896283de184d7dc Mon Sep 17 00:00:00 2001 From: kashike Date: Tue, 8 Mar 2016 13:05:59 -0800 Subject: [PATCH] Add BaseComponent sendMessage methods to CommandSender diff --git a/src/main/java/org/bukkit/command/CommandSender.java b/src/main/java/org/bukkit/command/CommandSender.java -index 74816c63..be11d52a 100644 +index 74816c63f..be11d52a0 100644 --- a/src/main/java/org/bukkit/command/CommandSender.java +++ b/src/main/java/org/bukkit/command/CommandSender.java @@ -62,4 +62,30 @@ public interface CommandSender extends Permissible { 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 91fc2ca6fb..9c66bbdc83 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 f133052d9aa3253191db6c03132f36d2a6c5a553 Mon Sep 17 00:00:00 2001 +From a82cad370c048e4abeadc1952efd1dcae58d1a3a Mon Sep 17 00:00:00 2001 From: mrapple Date: Sun, 25 Nov 2012 13:47:27 -0600 Subject: [PATCH] Add methods for working with arrows stuck in living entities diff --git a/Spigot-API-Patches/0021-Complete-resource-pack-API.patch b/Spigot-API-Patches/0021-Complete-resource-pack-API.patch index cf9d94223b..3896fc23ee 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 bd0e6228f445ce1b3e6dde9cba621e132eb3b4d2 Mon Sep 17 00:00:00 2001 +From 1d0ae007303eff42b8ff0bc7f0660beb0cc1b791 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 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 52db578059..55454f8b73 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 39aa81607372199ad89fe66301dc008dc4326e30 Mon Sep 17 00:00:00 2001 +From 32350eec467ac2afa26baa73be6e7f41fbdad443 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 3dac66d3..aceb6bbb 100644 +index 81851a293..94173d328 100644 --- a/pom.xml +++ b/pom.xml @@ -129,6 +129,17 @@ @@ -29,7 +29,7 @@ index 3dac66d3..aceb6bbb 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 12601db6..06b6724f 100644 +index 12601db68..06b6724fa 100644 --- a/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java +++ b/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java @@ -301,21 +301,7 @@ public final class JavaPluginLoader implements PluginLoader { 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 124c395096..3b599170ae 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 eca2d156a9ab87ab92228e8ae93fa65cc65cab02 Mon Sep 17 00:00:00 2001 +From 0272169024ee505ee1592d5ecccc89b758d444b7 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sun, 19 May 2013 20:36:58 -0400 Subject: [PATCH] Add a call helper to Event @@ -6,7 +6,7 @@ Subject: [PATCH] Add a call helper to Event Reduces diff in Server patches diff --git a/src/main/java/org/bukkit/event/Event.java b/src/main/java/org/bukkit/event/Event.java -index 18d0636b..8ec56cd6 100644 +index 18d0636b7..8ec56cd6b 100644 --- a/src/main/java/org/bukkit/event/Event.java +++ b/src/main/java/org/bukkit/event/Event.java @@ -35,6 +35,22 @@ public abstract class Event { 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 d613d9e5bb..800ba1e8ed 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 9de592f68b7fb6a7f83c8873216da8a771784ebd Mon Sep 17 00:00:00 2001 +From 03177fc70901119e30dc8cf1c37d19ea05ac7361 Mon Sep 17 00:00:00 2001 From: Aikar Date: Wed, 22 Jul 2015 18:50:41 -0400 Subject: [PATCH] Add sender name to commands.yml replacement @@ -7,7 +7,7 @@ This allows you to use $sender in commands.yml definitions to make commands that auto target self. diff --git a/src/main/java/org/bukkit/command/FormattedCommandAlias.java b/src/main/java/org/bukkit/command/FormattedCommandAlias.java -index a6ad94ef..9d4f553c 100644 +index a6ad94ef9..9d4f553c0 100644 --- a/src/main/java/org/bukkit/command/FormattedCommandAlias.java +++ b/src/main/java/org/bukkit/command/FormattedCommandAlias.java @@ -1,6 +1,9 @@ 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 567c12a274..7bca8d93ee 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 6df33d108c315e2684b89eaed4eb335c049684a3 Mon Sep 17 00:00:00 2001 +From 019f194ec956a3e9c97d500d066b95b5c48928dc Mon Sep 17 00:00:00 2001 From: William Date: Fri, 18 Mar 2016 03:28:07 -0400 Subject: [PATCH] Add command to reload permissions.yml and require confirm to @@ -6,7 +6,7 @@ Subject: [PATCH] Add command to reload permissions.yml and require confirm to diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java -index b92304e9..a3682b29 100644 +index b92304e9b..a3682b291 100644 --- a/src/main/java/org/bukkit/Bukkit.java +++ b/src/main/java/org/bukkit/Bukkit.java @@ -1516,6 +1516,13 @@ public final class Bukkit { @@ -24,7 +24,7 @@ index b92304e9..a3682b29 100644 @NotNull diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java -index d35d2def..18faba0e 100644 +index d35d2deff..18faba0e2 100644 --- a/src/main/java/org/bukkit/Server.java +++ b/src/main/java/org/bukkit/Server.java @@ -1338,4 +1338,6 @@ public interface Server extends PluginMessageRecipient { @@ -35,7 +35,7 @@ index d35d2def..18faba0e 100644 + void reloadPermissions(); // Paper } diff --git a/src/main/java/org/bukkit/command/defaults/ReloadCommand.java b/src/main/java/org/bukkit/command/defaults/ReloadCommand.java -index 50cc311b..c62da413 100644 +index 50cc311be..c62da4131 100644 --- a/src/main/java/org/bukkit/command/defaults/ReloadCommand.java +++ b/src/main/java/org/bukkit/command/defaults/ReloadCommand.java @@ -13,15 +13,35 @@ public class ReloadCommand extends BukkitCommand { @@ -85,7 +85,7 @@ index 50cc311b..c62da413 100644 } } diff --git a/src/main/java/org/bukkit/plugin/SimplePluginManager.java b/src/main/java/org/bukkit/plugin/SimplePluginManager.java -index aa0c809a..4cbec1f1 100644 +index aa0c809a6..4cbec1f11 100644 --- a/src/main/java/org/bukkit/plugin/SimplePluginManager.java +++ b/src/main/java/org/bukkit/plugin/SimplePluginManager.java @@ -808,4 +808,13 @@ public final class SimplePluginManager implements PluginManager { 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 90dc41a4f6..c59a05c87b 100644 --- a/Spigot-API-Patches/0026-Custom-replacement-for-eaten-items.patch +++ b/Spigot-API-Patches/0026-Custom-replacement-for-eaten-items.patch @@ -1,11 +1,11 @@ -From d00529ea428e96ea97364b8c2bc02c1681208fb6 Mon Sep 17 00:00:00 2001 +From 95131916a5f5d93f350b12a019630976d2d25d0f Mon Sep 17 00:00:00 2001 From: Jedediah Smith Date: Sun, 21 Jun 2015 15:05:21 -0400 Subject: [PATCH] Custom replacement for eaten items diff --git a/src/main/java/org/bukkit/event/player/PlayerItemConsumeEvent.java b/src/main/java/org/bukkit/event/player/PlayerItemConsumeEvent.java -index c2793f3e..373f4b5b 100644 +index c2793f3ef..373f4b5b5 100644 --- a/src/main/java/org/bukkit/event/player/PlayerItemConsumeEvent.java +++ b/src/main/java/org/bukkit/event/player/PlayerItemConsumeEvent.java @@ -22,6 +22,7 @@ public class PlayerItemConsumeEvent extends PlayerEvent implements Cancellable { diff --git a/Spigot-API-Patches/0027-Access-items-by-EquipmentSlot.patch b/Spigot-API-Patches/0027-Access-items-by-EquipmentSlot.patch index 71117a2eaf..af73d5a452 100644 --- a/Spigot-API-Patches/0027-Access-items-by-EquipmentSlot.patch +++ b/Spigot-API-Patches/0027-Access-items-by-EquipmentSlot.patch @@ -1,11 +1,11 @@ -From 97f9cfc53d2559c942affd253a465f1c630d80ac Mon Sep 17 00:00:00 2001 +From c3b69461ecc979423729c0967e4336b50c078dda Mon Sep 17 00:00:00 2001 From: Jedediah Smith Date: Sun, 20 Mar 2016 06:44:49 -0400 Subject: [PATCH] Access items by EquipmentSlot diff --git a/src/main/java/org/bukkit/inventory/PlayerInventory.java b/src/main/java/org/bukkit/inventory/PlayerInventory.java -index 88ce9dc6..96916ec9 100644 +index 88ce9dc6b..96916ec95 100644 --- a/src/main/java/org/bukkit/inventory/PlayerInventory.java +++ b/src/main/java/org/bukkit/inventory/PlayerInventory.java @@ -215,4 +215,23 @@ public interface PlayerInventory extends Inventory { 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 b886887974..5073c05d2e 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 908b4cc578018177445d0aa8e698025eaca3766c Mon Sep 17 00:00:00 2001 +From f2fc90f114e93b6c0fbe5c6f30c8531968e9de40 Mon Sep 17 00:00:00 2001 From: Aikar Date: Mon, 28 Mar 2016 20:26:34 -0400 Subject: [PATCH] Entity AddTo/RemoveFrom World Events @@ -6,7 +6,7 @@ Subject: [PATCH] Entity AddTo/RemoveFrom World Events diff --git a/src/main/java/com/destroystokyo/paper/event/entity/EntityAddToWorldEvent.java b/src/main/java/com/destroystokyo/paper/event/entity/EntityAddToWorldEvent.java new file mode 100644 -index 00000000..07660202 +index 000000000..07660202e --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/event/entity/EntityAddToWorldEvent.java @@ -0,0 +1,32 @@ @@ -44,7 +44,7 @@ index 00000000..07660202 +} diff --git a/src/main/java/com/destroystokyo/paper/event/entity/EntityRemoveFromWorldEvent.java b/src/main/java/com/destroystokyo/paper/event/entity/EntityRemoveFromWorldEvent.java new file mode 100644 -index 00000000..e5dbbd66 +index 000000000..e5dbbd660 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/event/entity/EntityRemoveFromWorldEvent.java @@ -0,0 +1,29 @@ diff --git a/Spigot-API-Patches/0029-EntityPathfindEvent.patch b/Spigot-API-Patches/0029-EntityPathfindEvent.patch index c5bd01846d..40794a34ae 100644 --- a/Spigot-API-Patches/0029-EntityPathfindEvent.patch +++ b/Spigot-API-Patches/0029-EntityPathfindEvent.patch @@ -1,4 +1,4 @@ -From 2d183ad2a2a9641486bce88f007e4fc63a8966a2 Mon Sep 17 00:00:00 2001 +From a66578234dea48996b7d7483d3a819792c8b3c93 Mon Sep 17 00:00:00 2001 From: Aikar Date: Mon, 28 Mar 2016 21:15:34 -0400 Subject: [PATCH] EntityPathfindEvent @@ -7,7 +7,7 @@ Fires when an Entity decides to start moving to a location. diff --git a/src/main/java/com/destroystokyo/paper/event/entity/EntityPathfindEvent.java b/src/main/java/com/destroystokyo/paper/event/entity/EntityPathfindEvent.java new file mode 100644 -index 00000000..63e46b2f +index 000000000..63e46b2fb --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/event/entity/EntityPathfindEvent.java @@ -0,0 +1,82 @@ 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 9a74470aee..0feef5def8 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 e19f0490d85cb7478d10caf867592ab896f275ee Mon Sep 17 00:00:00 2001 +From 0508f80da3da659a490dc6f3d1ee7e07ff5abcd0 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 @@ -8,7 +8,7 @@ limited synchronized portions to allow much higher concurrency in MetadataStore as well as far less locking, especially on reads diff --git a/src/main/java/org/bukkit/metadata/MetadataStoreBase.java b/src/main/java/org/bukkit/metadata/MetadataStoreBase.java -index 02795349..b3d85d97 100644 +index 027953499..b3d85d973 100644 --- a/src/main/java/org/bukkit/metadata/MetadataStoreBase.java +++ b/src/main/java/org/bukkit/metadata/MetadataStoreBase.java @@ -12,7 +12,7 @@ import org.bukkit.plugin.Plugin; diff --git a/Spigot-API-Patches/0031-Add-MetadataStoreBase.removeAll-Plugin.patch b/Spigot-API-Patches/0031-Add-MetadataStoreBase.removeAll-Plugin.patch index b55e65a64e..cf710426a6 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 28da1a3671afc7a8d288c6fb2a4bba46fb825c3a Mon Sep 17 00:00:00 2001 +From 0a6d869f3c9a97e13107d64099f27b73414799ab Mon Sep 17 00:00:00 2001 From: Aikar Date: Tue, 16 Jul 2013 21:26:50 -0400 Subject: [PATCH] Add MetadataStoreBase.removeAll(Plugin) @@ -6,7 +6,7 @@ Subject: [PATCH] Add MetadataStoreBase.removeAll(Plugin) So that on reload, metadata will be cleared diff --git a/src/main/java/org/bukkit/metadata/MetadataStoreBase.java b/src/main/java/org/bukkit/metadata/MetadataStoreBase.java -index b3d85d97..0e8cd85c 100644 +index b3d85d973..0e8cd85c7 100644 --- a/src/main/java/org/bukkit/metadata/MetadataStoreBase.java +++ b/src/main/java/org/bukkit/metadata/MetadataStoreBase.java @@ -4,6 +4,7 @@ import java.util.ArrayList; diff --git a/Spigot-API-Patches/0032-Add-PlayerUseUnknownEntityEvent.patch b/Spigot-API-Patches/0032-Add-PlayerUseUnknownEntityEvent.patch index 80b3d9fd0e..4c8dae3231 100644 --- a/Spigot-API-Patches/0032-Add-PlayerUseUnknownEntityEvent.patch +++ b/Spigot-API-Patches/0032-Add-PlayerUseUnknownEntityEvent.patch @@ -1,4 +1,4 @@ -From 9ba80874e113b6a58abc867723476a56c1821484 Mon Sep 17 00:00:00 2001 +From 9858f3b880966d75740bf15f83cf9135ed3ed0de Mon Sep 17 00:00:00 2001 From: Jedediah Smith Date: Sat, 2 Apr 2016 05:08:36 -0400 Subject: [PATCH] Add PlayerUseUnknownEntityEvent @@ -6,7 +6,7 @@ Subject: [PATCH] Add PlayerUseUnknownEntityEvent diff --git a/src/main/java/com/destroystokyo/paper/event/player/PlayerUseUnknownEntityEvent.java b/src/main/java/com/destroystokyo/paper/event/player/PlayerUseUnknownEntityEvent.java new file mode 100644 -index 00000000..09cfdf48 +index 000000000..09cfdf48e --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/event/player/PlayerUseUnknownEntityEvent.java @@ -0,0 +1,46 @@ 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 d7e84e846d..9fa3d878ad 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 09d30e91ba35eb1520c4f89087469bde676cced4 Mon Sep 17 00:00:00 2001 +From e1874caf49d11d319c67f650c50f89522bc35163 Mon Sep 17 00:00:00 2001 From: kashike Date: Wed, 13 Apr 2016 20:20:18 -0700 Subject: [PATCH] Add handshake event to allow plugins to handle client @@ -7,7 +7,7 @@ Subject: [PATCH] Add handshake event to allow plugins to handle client diff --git a/src/main/java/com/destroystokyo/paper/event/player/PlayerHandshakeEvent.java b/src/main/java/com/destroystokyo/paper/event/player/PlayerHandshakeEvent.java new file mode 100644 -index 00000000..f0bb4e31 +index 000000000..f0bb4e31c --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/event/player/PlayerHandshakeEvent.java @@ -0,0 +1,222 @@ @@ -234,5 +234,5 @@ index 00000000..f0bb4e31 + } +} -- -2.19.2 +2.21.0 diff --git a/Spigot-API-Patches/0034-Arrow-pickup-rule-API.patch b/Spigot-API-Patches/0034-Arrow-pickup-rule-API.patch index e936b100a1..f63b85a464 100644 --- a/Spigot-API-Patches/0034-Arrow-pickup-rule-API.patch +++ b/Spigot-API-Patches/0034-Arrow-pickup-rule-API.patch @@ -1,11 +1,11 @@ -From 0599f023061d1ef63c069dccc2477f24134e7ebc Mon Sep 17 00:00:00 2001 +From f60334f986fa97b67906ca99d7f655a4b757e8b7 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 diff --git a/src/main/java/org/bukkit/entity/AbstractArrow.java b/src/main/java/org/bukkit/entity/AbstractArrow.java -index 4460f6c9..a1990fef 100644 +index 4460f6c9e..a1990fef2 100644 --- a/src/main/java/org/bukkit/entity/AbstractArrow.java +++ b/src/main/java/org/bukkit/entity/AbstractArrow.java @@ -111,4 +111,38 @@ public interface AbstractArrow extends Projectile { diff --git a/Spigot-API-Patches/0035-EntityRegainHealthEvent-isFastRegen-API.patch b/Spigot-API-Patches/0035-EntityRegainHealthEvent-isFastRegen-API.patch index 61ad54c581..6cceaa75e9 100644 --- a/Spigot-API-Patches/0035-EntityRegainHealthEvent-isFastRegen-API.patch +++ b/Spigot-API-Patches/0035-EntityRegainHealthEvent-isFastRegen-API.patch @@ -1,11 +1,11 @@ -From 4fe67c4add046aa9e0f5a4b7f41b96f5061c5d61 Mon Sep 17 00:00:00 2001 +From 8940e7d1f71a344b76954326e6836a9882f943cf Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Fri, 22 Apr 2016 01:43:11 -0500 Subject: [PATCH] EntityRegainHealthEvent isFastRegen API diff --git a/src/main/java/org/bukkit/event/entity/EntityRegainHealthEvent.java b/src/main/java/org/bukkit/event/entity/EntityRegainHealthEvent.java -index 8feb6698..d51d2ec1 100644 +index 8feb6698f..d51d2ec1d 100644 --- a/src/main/java/org/bukkit/event/entity/EntityRegainHealthEvent.java +++ b/src/main/java/org/bukkit/event/entity/EntityRegainHealthEvent.java @@ -13,12 +13,31 @@ public class EntityRegainHealthEvent extends EntityEvent implements Cancellable diff --git a/Spigot-API-Patches/0036-LootTable-API.patch b/Spigot-API-Patches/0036-LootTable-API.patch index 2b6cc14215..18488411b9 100644 --- a/Spigot-API-Patches/0036-LootTable-API.patch +++ b/Spigot-API-Patches/0036-LootTable-API.patch @@ -1,4 +1,4 @@ -From 823936f1edcfbf8cb8d8cf2d6ba18eb14f86b9ac Mon Sep 17 00:00:00 2001 +From 6b58ff457bb263429d4ede1ec871cf5efc47da0b Mon Sep 17 00:00:00 2001 From: Aikar Date: Sun, 1 May 2016 15:19:49 -0400 Subject: [PATCH] LootTable API @@ -12,7 +12,7 @@ Provides methods to determine players looted state for an object diff --git a/src/main/java/com/destroystokyo/paper/loottable/LootableBlockInventory.java b/src/main/java/com/destroystokyo/paper/loottable/LootableBlockInventory.java new file mode 100644 -index 00000000..92d7b853 +index 000000000..92d7b853a --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/loottable/LootableBlockInventory.java @@ -0,0 +1,17 @@ @@ -35,7 +35,7 @@ index 00000000..92d7b853 +} diff --git a/src/main/java/com/destroystokyo/paper/loottable/LootableEntityInventory.java b/src/main/java/com/destroystokyo/paper/loottable/LootableEntityInventory.java new file mode 100644 -index 00000000..b387894f +index 000000000..b387894fe --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/loottable/LootableEntityInventory.java @@ -0,0 +1,17 @@ @@ -58,7 +58,7 @@ index 00000000..b387894f +} diff --git a/src/main/java/com/destroystokyo/paper/loottable/LootableInventory.java b/src/main/java/com/destroystokyo/paper/loottable/LootableInventory.java new file mode 100644 -index 00000000..97815eeb +index 000000000..97815eeb2 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/loottable/LootableInventory.java @@ -0,0 +1,116 @@ @@ -180,7 +180,7 @@ index 00000000..97815eeb +} diff --git a/src/main/java/com/destroystokyo/paper/loottable/LootableInventoryReplenishEvent.java b/src/main/java/com/destroystokyo/paper/loottable/LootableInventoryReplenishEvent.java new file mode 100644 -index 00000000..fd184f13 +index 000000000..fd184f13f --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/loottable/LootableInventoryReplenishEvent.java @@ -0,0 +1,45 @@ @@ -230,7 +230,7 @@ index 00000000..fd184f13 + } +} diff --git a/src/main/java/org/bukkit/block/Chest.java b/src/main/java/org/bukkit/block/Chest.java -index c67d7110..a569c7b6 100644 +index c67d71101..a569c7b63 100644 --- a/src/main/java/org/bukkit/block/Chest.java +++ b/src/main/java/org/bukkit/block/Chest.java @@ -1,5 +1,7 @@ @@ -251,7 +251,7 @@ index c67d7110..a569c7b6 100644 /** * Gets the inventory of the chest block represented by this block state. diff --git a/src/main/java/org/bukkit/block/Dispenser.java b/src/main/java/org/bukkit/block/Dispenser.java -index 74cd194c..07af1a3f 100644 +index 74cd194c9..07af1a3f0 100644 --- a/src/main/java/org/bukkit/block/Dispenser.java +++ b/src/main/java/org/bukkit/block/Dispenser.java @@ -1,5 +1,6 @@ @@ -271,7 +271,7 @@ index 74cd194c..07af1a3f 100644 /** * Gets the BlockProjectileSource object for the dispenser. diff --git a/src/main/java/org/bukkit/block/Dropper.java b/src/main/java/org/bukkit/block/Dropper.java -index 424392fb..c7620232 100644 +index 424392fb5..c76202321 100644 --- a/src/main/java/org/bukkit/block/Dropper.java +++ b/src/main/java/org/bukkit/block/Dropper.java @@ -1,11 +1,12 @@ @@ -289,7 +289,7 @@ index 424392fb..c7620232 100644 /** * Tries to drop a randomly selected item from the dropper's inventory, diff --git a/src/main/java/org/bukkit/block/Hopper.java b/src/main/java/org/bukkit/block/Hopper.java -index 58e49309..7ade312f 100644 +index 58e493099..7ade312f1 100644 --- a/src/main/java/org/bukkit/block/Hopper.java +++ b/src/main/java/org/bukkit/block/Hopper.java @@ -1,8 +1,9 @@ @@ -304,7 +304,7 @@ index 58e49309..7ade312f 100644 -public interface Hopper extends Container, Lootable { } +public interface Hopper extends Container, LootableBlockInventory { } // Paper diff --git a/src/main/java/org/bukkit/block/ShulkerBox.java b/src/main/java/org/bukkit/block/ShulkerBox.java -index 938f9aea..42f5b4ea 100644 +index 938f9aead..42f5b4ea3 100644 --- a/src/main/java/org/bukkit/block/ShulkerBox.java +++ b/src/main/java/org/bukkit/block/ShulkerBox.java @@ -1,5 +1,6 @@ @@ -324,7 +324,7 @@ index 938f9aea..42f5b4ea 100644 /** * Get the {@link DyeColor} corresponding to this ShulkerBox diff --git a/src/main/java/org/bukkit/entity/minecart/HopperMinecart.java b/src/main/java/org/bukkit/entity/minecart/HopperMinecart.java -index 937b99f8..db69687a 100644 +index 937b99f87..db69687a7 100644 --- a/src/main/java/org/bukkit/entity/minecart/HopperMinecart.java +++ b/src/main/java/org/bukkit/entity/minecart/HopperMinecart.java @@ -1,5 +1,6 @@ @@ -344,7 +344,7 @@ index 937b99f8..db69687a 100644 /** * Checks whether or not this Minecart will pick up diff --git a/src/main/java/org/bukkit/entity/minecart/StorageMinecart.java b/src/main/java/org/bukkit/entity/minecart/StorageMinecart.java -index 9ea403e6..238d118f 100644 +index 9ea403e6f..238d118f7 100644 --- a/src/main/java/org/bukkit/entity/minecart/StorageMinecart.java +++ b/src/main/java/org/bukkit/entity/minecart/StorageMinecart.java @@ -1,5 +1,6 @@ @@ -362,7 +362,7 @@ index 9ea403e6..238d118f 100644 +public interface StorageMinecart extends Minecart, InventoryHolder, LootableEntityInventory { // Paper } diff --git a/src/main/java/org/bukkit/loot/Lootable.java b/src/main/java/org/bukkit/loot/Lootable.java -index 24a3d989..901db852 100644 +index 24a3d989d..901db8524 100644 --- a/src/main/java/org/bukkit/loot/Lootable.java +++ b/src/main/java/org/bukkit/loot/Lootable.java @@ -36,6 +36,34 @@ public interface Lootable { diff --git a/Spigot-API-Patches/0037-Add-EntityZapEvent.patch b/Spigot-API-Patches/0037-Add-EntityZapEvent.patch index 337d0ec381..e0a44a00ac 100644 --- a/Spigot-API-Patches/0037-Add-EntityZapEvent.patch +++ b/Spigot-API-Patches/0037-Add-EntityZapEvent.patch @@ -1,4 +1,4 @@ -From 58a3f2295b0e58314b33d6908388bef6920b11a5 Mon Sep 17 00:00:00 2001 +From 25acd4059391456b1824e2b86be9efee9b579877 Mon Sep 17 00:00:00 2001 From: AlphaBlend Date: Sun, 16 Oct 2016 23:19:34 -0700 Subject: [PATCH] Add EntityZapEvent @@ -6,7 +6,7 @@ Subject: [PATCH] Add EntityZapEvent diff --git a/src/main/java/com/destroystokyo/paper/event/entity/EntityZapEvent.java b/src/main/java/com/destroystokyo/paper/event/entity/EntityZapEvent.java new file mode 100644 -index 00000000..3b725a48 +index 000000000..3b725a489 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/event/entity/EntityZapEvent.java @@ -0,0 +1,65 @@ @@ -76,7 +76,7 @@ index 00000000..3b725a48 + } +} diff --git a/src/main/java/org/bukkit/event/entity/PigZapEvent.java b/src/main/java/org/bukkit/event/entity/PigZapEvent.java -index 0e0ed93b..d3949edf 100644 +index 0e0ed93b5..d3949edfc 100644 --- a/src/main/java/org/bukkit/event/entity/PigZapEvent.java +++ b/src/main/java/org/bukkit/event/entity/PigZapEvent.java @@ -2,6 +2,7 @@ package org.bukkit.event.entity; diff --git a/Spigot-API-Patches/0038-Misc-Utils.patch b/Spigot-API-Patches/0038-Misc-Utils.patch index 17041e43c5..d27aad7620 100644 --- a/Spigot-API-Patches/0038-Misc-Utils.patch +++ b/Spigot-API-Patches/0038-Misc-Utils.patch @@ -1,4 +1,4 @@ -From d47598b680c174abd7021e7857452886e09f4346 Mon Sep 17 00:00:00 2001 +From e746bcea33d274458ccfd816fcb2f8a63ac6f1a1 Mon Sep 17 00:00:00 2001 From: vemacs Date: Wed, 23 Nov 2016 12:53:43 -0500 Subject: [PATCH] Misc Utils @@ -6,7 +6,7 @@ Subject: [PATCH] Misc Utils diff --git a/src/main/java/com/destroystokyo/paper/utils/CachedSizeConcurrentLinkedQueue.java b/src/main/java/com/destroystokyo/paper/utils/CachedSizeConcurrentLinkedQueue.java new file mode 100644 -index 00000000..5bb677ce +index 000000000..5bb677ce5 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/utils/CachedSizeConcurrentLinkedQueue.java @@ -0,0 +1,34 @@ 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 ddb176726b..80dc30de97 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 8e06e63bd85cca024c4e38e35741ddac6f809b48 Mon Sep 17 00:00:00 2001 +From 68b57fb41e3bae33ce18fe38d6aeb4a5e00b1b1e Mon Sep 17 00:00:00 2001 From: willies952002 Date: Mon, 28 Nov 2016 10:16:39 -0500 Subject: [PATCH] Allow Reloading of Command Aliases @@ -6,7 +6,7 @@ Subject: [PATCH] Allow Reloading of Command Aliases Reload the aliases stored in commands.yml diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java -index a3682b29..a0a8b540 100644 +index a3682b291..a0a8b5408 100644 --- a/src/main/java/org/bukkit/Bukkit.java +++ b/src/main/java/org/bukkit/Bukkit.java @@ -1523,6 +1523,15 @@ public final class Bukkit { @@ -26,7 +26,7 @@ index a3682b29..a0a8b540 100644 @NotNull diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java -index 18faba0e..d20e044d 100644 +index 18faba0e2..d20e044dd 100644 --- a/src/main/java/org/bukkit/Server.java +++ b/src/main/java/org/bukkit/Server.java @@ -1340,4 +1340,6 @@ public interface Server extends PluginMessageRecipient { @@ -37,7 +37,7 @@ index 18faba0e..d20e044d 100644 + boolean reloadCommandAliases(); // Paper } diff --git a/src/main/java/org/bukkit/command/CommandMap.java b/src/main/java/org/bukkit/command/CommandMap.java -index bd2c7a69..864c263b 100644 +index bd2c7a696..864c263bb 100644 --- a/src/main/java/org/bukkit/command/CommandMap.java +++ b/src/main/java/org/bukkit/command/CommandMap.java @@ -128,4 +128,14 @@ public interface CommandMap { @@ -56,7 +56,7 @@ index bd2c7a69..864c263b 100644 + // Paper end } diff --git a/src/main/java/org/bukkit/command/SimpleCommandMap.java b/src/main/java/org/bukkit/command/SimpleCommandMap.java -index adfc7aae..460fda05 100644 +index adfc7aae2..460fda05a 100644 --- a/src/main/java/org/bukkit/command/SimpleCommandMap.java +++ b/src/main/java/org/bukkit/command/SimpleCommandMap.java @@ -297,4 +297,11 @@ public class SimpleCommandMap implements CommandMap { @@ -72,7 +72,7 @@ index adfc7aae..460fda05 100644 + // Paper end } diff --git a/src/main/java/org/bukkit/command/defaults/ReloadCommand.java b/src/main/java/org/bukkit/command/defaults/ReloadCommand.java -index c62da413..af8ab73f 100644 +index c62da4131..af8ab73fe 100644 --- a/src/main/java/org/bukkit/command/defaults/ReloadCommand.java +++ b/src/main/java/org/bukkit/command/defaults/ReloadCommand.java @@ -13,7 +13,7 @@ public class ReloadCommand extends BukkitCommand { diff --git a/Spigot-API-Patches/0040-Add-source-to-PlayerExpChangeEvent.patch b/Spigot-API-Patches/0040-Add-source-to-PlayerExpChangeEvent.patch index a8b4918183..83dbddbf40 100644 --- a/Spigot-API-Patches/0040-Add-source-to-PlayerExpChangeEvent.patch +++ b/Spigot-API-Patches/0040-Add-source-to-PlayerExpChangeEvent.patch @@ -1,11 +1,11 @@ -From dfd138e944f9160fc420ca7166f17938eeb60b78 Mon Sep 17 00:00:00 2001 +From 4ae78dd5dd3aa2a87adbe810a834661deeae82e2 Mon Sep 17 00:00:00 2001 From: AlphaBlend Date: Thu, 8 Sep 2016 08:47:08 -0700 Subject: [PATCH] Add source to PlayerExpChangeEvent diff --git a/src/main/java/org/bukkit/event/player/PlayerExpChangeEvent.java b/src/main/java/org/bukkit/event/player/PlayerExpChangeEvent.java -index c99c9281..7c340f53 100644 +index c99c9281e..7c340f539 100644 --- a/src/main/java/org/bukkit/event/player/PlayerExpChangeEvent.java +++ b/src/main/java/org/bukkit/event/player/PlayerExpChangeEvent.java @@ -1,21 +1,43 @@ diff --git a/Spigot-API-Patches/0041-Add-ProjectileCollideEvent.patch b/Spigot-API-Patches/0041-Add-ProjectileCollideEvent.patch index 3f9d14f251..97e80e5984 100644 --- a/Spigot-API-Patches/0041-Add-ProjectileCollideEvent.patch +++ b/Spigot-API-Patches/0041-Add-ProjectileCollideEvent.patch @@ -1,4 +1,4 @@ -From 619be3c6e1af342ed5b97e56b426e9767bc3c630 Mon Sep 17 00:00:00 2001 +From 37e2a1919a29437da21406ed3f47243a5b66c365 Mon Sep 17 00:00:00 2001 From: Techcable Date: Fri, 16 Dec 2016 21:25:39 -0600 Subject: [PATCH] Add ProjectileCollideEvent @@ -6,7 +6,7 @@ Subject: [PATCH] Add ProjectileCollideEvent diff --git a/src/main/java/com/destroystokyo/paper/event/entity/ProjectileCollideEvent.java b/src/main/java/com/destroystokyo/paper/event/entity/ProjectileCollideEvent.java new file mode 100644 -index 00000000..45366389 +index 000000000..453663893 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/event/entity/ProjectileCollideEvent.java @@ -0,0 +1,67 @@ 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 2eabae31d0..96bdf303ca 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 fd66e162c93936eea057dc6cbed1ae4d82f93a0e Mon Sep 17 00:00:00 2001 +From 8c89ef7105e1fdd8f531ab2c48fd74d7fb470d96 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 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 0348a6d08c..1ca03caaee 100644 --- a/Spigot-API-Patches/0043-Add-API-methods-to-control-if-armour-stands-can-move.patch +++ b/Spigot-API-Patches/0043-Add-API-methods-to-control-if-armour-stands-can-move.patch @@ -1,11 +1,11 @@ -From daf8f6bd192c9dcbf227bc01c9a323fd59e254b8 Mon Sep 17 00:00:00 2001 +From bfa947da63d3e584332db78f37e08671ae142d48 Mon Sep 17 00:00:00 2001 From: kashike Date: Wed, 21 Dec 2016 11:47:25 -0600 Subject: [PATCH] Add API methods to control if armour stands can move diff --git a/src/main/java/org/bukkit/entity/ArmorStand.java b/src/main/java/org/bukkit/entity/ArmorStand.java -index d04e52fb..387d04e5 100644 +index d04e52fbe..387d04e5b 100644 --- a/src/main/java/org/bukkit/entity/ArmorStand.java +++ b/src/main/java/org/bukkit/entity/ArmorStand.java @@ -271,4 +271,22 @@ public interface ArmorStand extends LivingEntity { diff --git a/Spigot-API-Patches/0044-IllegalPacketEvent.patch b/Spigot-API-Patches/0044-IllegalPacketEvent.patch index 0e89b11435..2b1ac4ae6e 100644 --- a/Spigot-API-Patches/0044-IllegalPacketEvent.patch +++ b/Spigot-API-Patches/0044-IllegalPacketEvent.patch @@ -1,4 +1,4 @@ -From 6326993e6b80b9f7aceb5601e7f0bd79b8824db2 Mon Sep 17 00:00:00 2001 +From 9ee58b2c80de2903db18ea2c163a6b6e2aae5084 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sun, 4 Dec 2016 01:19:14 -0500 Subject: [PATCH] IllegalPacketEvent @@ -9,7 +9,7 @@ Lets plugins change the kick message and if it should kick or not. diff --git a/src/main/java/com/destroystokyo/paper/event/player/IllegalPacketEvent.java b/src/main/java/com/destroystokyo/paper/event/player/IllegalPacketEvent.java new file mode 100644 -index 00000000..37a17f0b +index 000000000..37a17f0bb --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/event/player/IllegalPacketEvent.java @@ -0,0 +1,70 @@ diff --git a/Spigot-API-Patches/0045-Fireworks-API-s.patch b/Spigot-API-Patches/0045-Fireworks-API-s.patch index ea6671d2b1..343ec1a0e3 100644 --- a/Spigot-API-Patches/0045-Fireworks-API-s.patch +++ b/Spigot-API-Patches/0045-Fireworks-API-s.patch @@ -1,4 +1,4 @@ -From fee18582db9f6a66e6476a7e2ff900e082ac1659 Mon Sep 17 00:00:00 2001 +From 85c132f14e2c2617018124b1bd4e6bbf01202967 Mon Sep 17 00:00:00 2001 From: Aikar Date: Wed, 28 Dec 2016 01:18:55 -0500 Subject: [PATCH] Fireworks API's @@ -7,7 +7,7 @@ Get the Entity being boosted Get the firework launcher diff --git a/src/main/java/org/bukkit/entity/Firework.java b/src/main/java/org/bukkit/entity/Firework.java -index 1c55f033..7df26cf7 100644 +index 1c55f0338..7df26cf7f 100644 --- a/src/main/java/org/bukkit/entity/Firework.java +++ b/src/main/java/org/bukkit/entity/Firework.java @@ -3,6 +3,9 @@ package org.bukkit.entity; diff --git a/Spigot-API-Patches/0046-PlayerTeleportEndGatewayEvent.patch b/Spigot-API-Patches/0046-PlayerTeleportEndGatewayEvent.patch index 9424ae3937..59dc50e24d 100644 --- a/Spigot-API-Patches/0046-PlayerTeleportEndGatewayEvent.patch +++ b/Spigot-API-Patches/0046-PlayerTeleportEndGatewayEvent.patch @@ -1,4 +1,4 @@ -From 4b0ac62856b74a0a002b280d0d8a60d7a038e180 Mon Sep 17 00:00:00 2001 +From 23a6fdaa9571cba7bf8a3dfb77b867ebe21cf05c Mon Sep 17 00:00:00 2001 From: Aikar Date: Sat, 31 Dec 2016 20:29:33 -0500 Subject: [PATCH] PlayerTeleportEndGatewayEvent @@ -7,7 +7,7 @@ Allows you to access the Gateway being used in a teleport event diff --git a/src/main/java/com/destroystokyo/paper/event/player/PlayerTeleportEndGatewayEvent.java b/src/main/java/com/destroystokyo/paper/event/player/PlayerTeleportEndGatewayEvent.java new file mode 100644 -index 00000000..b64ab6ee +index 000000000..b64ab6eec --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/event/player/PlayerTeleportEndGatewayEvent.java @@ -0,0 +1,29 @@ 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 ab37271f3a..d8314fef7d 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 60957aa5e1df382fd211eaaaa2fb9d063c499d75 Mon Sep 17 00:00:00 2001 +From c4d70f57de38f0309bdc520b81d71e8321ae9cbd Mon Sep 17 00:00:00 2001 From: Aikar Date: Sat, 7 Jan 2017 15:23:03 -0500 Subject: [PATCH] Provide E/TE/Chunk count stat methods @@ -7,7 +7,7 @@ Provides counts without the ineffeciency of using .getEntities().size() which creates copy of the collections. diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java -index 17b4f38d..80608e7a 100644 +index ac7ef3c8b..d1d64fb60 100644 --- a/src/main/java/org/bukkit/World.java +++ b/src/main/java/org/bukkit/World.java @@ -38,6 +38,33 @@ import org.jetbrains.annotations.Nullable; 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 294f9e6326..aacbf4876c 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 73882b98ebeec264ffcbd3e0d396e85b9d7dfba0 Mon Sep 17 00:00:00 2001 +From 495b6eca21f4c309b5deca8c7dae128dbc4437bc Mon Sep 17 00:00:00 2001 From: Aikar Date: Tue, 19 Dec 2017 16:28:32 -0500 Subject: [PATCH] ExperienceOrbs API for Reason/Source/Triggering player @@ -8,7 +8,7 @@ Adds lots of information about why this orb exists. Replaces isFromBottle() with logic that persists entity reloads too. diff --git a/src/main/java/org/bukkit/entity/ExperienceOrb.java b/src/main/java/org/bukkit/entity/ExperienceOrb.java -index c286edfd..dec70bbf 100644 +index c286edfd8..dec70bbfa 100644 --- a/src/main/java/org/bukkit/entity/ExperienceOrb.java +++ b/src/main/java/org/bukkit/entity/ExperienceOrb.java @@ -1,5 +1,8 @@ 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 f0cc79a049..a44719fccb 100644 --- a/Spigot-API-Patches/0049-Expose-WorldBorder-isInBounds-Location-check.patch +++ b/Spigot-API-Patches/0049-Expose-WorldBorder-isInBounds-Location-check.patch @@ -1,11 +1,11 @@ -From 09790abb8f5f87f7af4f33d8e9f0f3a2af51674c Mon Sep 17 00:00:00 2001 +From 55f5cea677e52578871f152f191b6e2d1254e5b0 Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Sat, 21 Jan 2017 17:03:10 -0600 Subject: [PATCH] Expose WorldBorder#isInBounds(Location) check diff --git a/src/main/java/org/bukkit/WorldBorder.java b/src/main/java/org/bukkit/WorldBorder.java -index 7e8f5649..afb7b136 100644 +index 7e8f5649c..afb7b136b 100644 --- a/src/main/java/org/bukkit/WorldBorder.java +++ b/src/main/java/org/bukkit/WorldBorder.java @@ -117,4 +117,18 @@ public interface WorldBorder { 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 517302e1e8..e3feaabe2b 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 7070e4f10451715c06c1766937634f1b7f4ab98d Mon Sep 17 00:00:00 2001 +From 7ffd449da31280a2729fff793273fdd0ec2efb99 Mon Sep 17 00:00:00 2001 From: kashike Date: Fri, 9 Jun 2017 07:24:24 -0700 Subject: [PATCH] Add configuration option to prevent player names from being @@ -6,7 +6,7 @@ Subject: [PATCH] Add configuration option to prevent player names from being diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java -index a0a8b540..b5b77b2d 100644 +index a0a8b5408..b5b77b2d8 100644 --- a/src/main/java/org/bukkit/Bukkit.java +++ b/src/main/java/org/bukkit/Bukkit.java @@ -1532,6 +1532,16 @@ public final class Bukkit { @@ -27,7 +27,7 @@ index a0a8b540..b5b77b2d 100644 @NotNull diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java -index d20e044d..103897fb 100644 +index d20e044dd..103897fbe 100644 --- a/src/main/java/org/bukkit/Server.java +++ b/src/main/java/org/bukkit/Server.java @@ -1342,4 +1342,14 @@ public interface Server extends PluginMessageRecipient { @@ -46,7 +46,7 @@ index d20e044d..103897fb 100644 + // Paper end } diff --git a/src/main/java/org/bukkit/command/PluginCommand.java b/src/main/java/org/bukkit/command/PluginCommand.java -index 7f153000..1e126487 100644 +index 7f153000e..1e126487d 100644 --- a/src/main/java/org/bukkit/command/PluginCommand.java +++ b/src/main/java/org/bukkit/command/PluginCommand.java @@ -151,6 +151,7 @@ public final class PluginCommand extends Command implements PluginIdentifiableCo diff --git a/Spigot-API-Patches/0051-Fix-upstream-javadoc-warnings-and-errors.patch b/Spigot-API-Patches/0051-Fix-upstream-javadoc-warnings-and-errors.patch index 6ef91f6198..02373c180b 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 f23f0d063ab357133aaa4eb44a040d87f50ba7eb Mon Sep 17 00:00:00 2001 +From ffae0ecb3086b83508fbe0c909da482a0befe9a1 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 diff --git a/Spigot-API-Patches/0052-Item-canEntityPickup.patch b/Spigot-API-Patches/0052-Item-canEntityPickup.patch index 308161eb1b..1b87971751 100644 --- a/Spigot-API-Patches/0052-Item-canEntityPickup.patch +++ b/Spigot-API-Patches/0052-Item-canEntityPickup.patch @@ -1,11 +1,11 @@ -From 87a96f0c2377911d526b21f1353398f3bf33198f Mon Sep 17 00:00:00 2001 +From d9669515edd73353d2ea0ce547fa98a210776a57 Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Fri, 5 May 2017 03:57:08 -0500 Subject: [PATCH] Item#canEntityPickup diff --git a/src/main/java/org/bukkit/entity/Item.java b/src/main/java/org/bukkit/entity/Item.java -index 00c58c1d..cb9e9f36 100644 +index 00c58c1d9..cb9e9f369 100644 --- a/src/main/java/org/bukkit/entity/Item.java +++ b/src/main/java/org/bukkit/entity/Item.java @@ -37,4 +37,20 @@ public interface Item extends Entity { diff --git a/Spigot-API-Patches/0053-PlayerPickupItemEvent-setFlyAtPlayer.patch b/Spigot-API-Patches/0053-PlayerPickupItemEvent-setFlyAtPlayer.patch index 984a79470a..c4d5987c20 100644 --- a/Spigot-API-Patches/0053-PlayerPickupItemEvent-setFlyAtPlayer.patch +++ b/Spigot-API-Patches/0053-PlayerPickupItemEvent-setFlyAtPlayer.patch @@ -1,11 +1,11 @@ -From 3d62f02e2b5e03a136cfc8ee51b88e42221fd595 Mon Sep 17 00:00:00 2001 +From f772280393bb1d4abe8ee41528c4dde92691509e Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Sun, 7 May 2017 06:26:01 -0500 Subject: [PATCH] PlayerPickupItemEvent#setFlyAtPlayer diff --git a/src/main/java/org/bukkit/event/player/PlayerPickupItemEvent.java b/src/main/java/org/bukkit/event/player/PlayerPickupItemEvent.java -index 951ea2cc..18d82c11 100644 +index 951ea2cc7..18d82c111 100644 --- a/src/main/java/org/bukkit/event/player/PlayerPickupItemEvent.java +++ b/src/main/java/org/bukkit/event/player/PlayerPickupItemEvent.java @@ -17,6 +17,7 @@ import org.jetbrains.annotations.NotNull; diff --git a/Spigot-API-Patches/0054-PlayerAttemptPickupItemEvent.patch b/Spigot-API-Patches/0054-PlayerAttemptPickupItemEvent.patch index 7e4c876956..1b0cecfc4e 100644 --- a/Spigot-API-Patches/0054-PlayerAttemptPickupItemEvent.patch +++ b/Spigot-API-Patches/0054-PlayerAttemptPickupItemEvent.patch @@ -1,4 +1,4 @@ -From db41e869a62491d7136eccdf5032653ac17c8c4d Mon Sep 17 00:00:00 2001 +From fe4a1550ea9e102b54504671767ad33fe89647d1 Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Sun, 11 Jun 2017 16:30:37 -0500 Subject: [PATCH] PlayerAttemptPickupItemEvent @@ -6,7 +6,7 @@ Subject: [PATCH] PlayerAttemptPickupItemEvent diff --git a/src/main/java/org/bukkit/event/player/PlayerAttemptPickupItemEvent.java b/src/main/java/org/bukkit/event/player/PlayerAttemptPickupItemEvent.java new file mode 100644 -index 00000000..fb5cb3dc +index 000000000..fb5cb3dc4 --- /dev/null +++ b/src/main/java/org/bukkit/event/player/PlayerAttemptPickupItemEvent.java @@ -0,0 +1,89 @@ diff --git a/Spigot-API-Patches/0055-Add-UnknownCommandEvent.patch b/Spigot-API-Patches/0055-Add-UnknownCommandEvent.patch index 3adcd35427..cd781379ce 100644 --- a/Spigot-API-Patches/0055-Add-UnknownCommandEvent.patch +++ b/Spigot-API-Patches/0055-Add-UnknownCommandEvent.patch @@ -1,4 +1,4 @@ -From ec4a76274dc2d8fa737b1cca310d75c4f4628bc7 Mon Sep 17 00:00:00 2001 +From cb380ac3e8c6105583c786d8ea33885211409810 Mon Sep 17 00:00:00 2001 From: Sweepyoface Date: Sat, 17 Jun 2017 18:48:06 -0400 Subject: [PATCH] Add UnknownCommandEvent @@ -6,7 +6,7 @@ Subject: [PATCH] Add UnknownCommandEvent diff --git a/src/main/java/org/bukkit/event/command/UnknownCommandEvent.java b/src/main/java/org/bukkit/event/command/UnknownCommandEvent.java new file mode 100644 -index 00000000..251342c3 +index 000000000..251342c3c --- /dev/null +++ b/src/main/java/org/bukkit/event/command/UnknownCommandEvent.java @@ -0,0 +1,82 @@ diff --git a/Spigot-API-Patches/0056-Basic-PlayerProfile-API.patch b/Spigot-API-Patches/0056-Basic-PlayerProfile-API.patch index cc324ab048..c09d4d13f9 100644 --- a/Spigot-API-Patches/0056-Basic-PlayerProfile-API.patch +++ b/Spigot-API-Patches/0056-Basic-PlayerProfile-API.patch @@ -1,4 +1,4 @@ -From 70559f747cdfd82b811d7b2e356669afc267f9e7 Mon Sep 17 00:00:00 2001 +From 5c0def0c0921aa93f2a86e44d159abf7ab8db9f8 Mon Sep 17 00:00:00 2001 From: Aikar Date: Mon, 15 Jan 2018 21:46:46 -0500 Subject: [PATCH] Basic PlayerProfile API @@ -7,7 +7,7 @@ Provides basic elements of a PlayerProfile to be used by future API/events diff --git a/src/main/java/com/destroystokyo/paper/profile/PlayerProfile.java b/src/main/java/com/destroystokyo/paper/profile/PlayerProfile.java new file mode 100644 -index 00000000..476151d2 +index 000000000..476151d2a --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/profile/PlayerProfile.java @@ -0,0 +1,145 @@ @@ -158,7 +158,7 @@ index 00000000..476151d2 +} diff --git a/src/main/java/com/destroystokyo/paper/profile/ProfileProperty.java b/src/main/java/com/destroystokyo/paper/profile/ProfileProperty.java new file mode 100644 -index 00000000..7b3b6ef5 +index 000000000..7b3b6ef53 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/profile/ProfileProperty.java @@ -0,0 +1,72 @@ @@ -235,7 +235,7 @@ index 00000000..7b3b6ef5 + } +} diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java -index b5b77b2d..161a714e 100644 +index b5b77b2d8..161a714e5 100644 --- a/src/main/java/org/bukkit/Bukkit.java +++ b/src/main/java/org/bukkit/Bukkit.java @@ -1542,6 +1542,40 @@ public final class Bukkit { @@ -280,7 +280,7 @@ index b5b77b2d..161a714e 100644 @NotNull diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java -index 103897fb..463724e4 100644 +index 103897fbe..463724e40 100644 --- a/src/main/java/org/bukkit/Server.java +++ b/src/main/java/org/bukkit/Server.java @@ -1351,5 +1351,33 @@ public interface Server extends PluginMessageRecipient { diff --git a/Spigot-API-Patches/0057-Shoulder-Entities-Release-API.patch b/Spigot-API-Patches/0057-Shoulder-Entities-Release-API.patch index 65dee49a84..6937522c0c 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 eba649f74129e9b960548a5f2bff478f385e979b Mon Sep 17 00:00:00 2001 +From 8351f7cc785ea8e94ba98bc60df0897feb7f2058 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 6277f392..5b5fb303 100644 +index 6277f3928..5b5fb3034 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 1137d32e5d..108bbf8bb3 100644 --- a/Spigot-API-Patches/0058-Profile-Lookup-Events.patch +++ b/Spigot-API-Patches/0058-Profile-Lookup-Events.patch @@ -1,4 +1,4 @@ -From 899ca9c0ccac00c3c564243608ed32aaa5a0fb4f Mon Sep 17 00:00:00 2001 +From 0265b17fc637b5b058e97621adf08e5bb4766044 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sat, 17 Jun 2017 16:30:44 -0400 Subject: [PATCH] Profile Lookup Events @@ -8,7 +8,7 @@ profiles that had to be looked up. diff --git a/src/main/java/com/destroystokyo/paper/event/profile/LookupProfileEvent.java b/src/main/java/com/destroystokyo/paper/event/profile/LookupProfileEvent.java new file mode 100644 -index 00000000..8df37c07 +index 000000000..8df37c07c --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/event/profile/LookupProfileEvent.java @@ -0,0 +1,46 @@ @@ -60,7 +60,7 @@ index 00000000..8df37c07 +} diff --git a/src/main/java/com/destroystokyo/paper/event/profile/PreLookupProfileEvent.java b/src/main/java/com/destroystokyo/paper/event/profile/PreLookupProfileEvent.java new file mode 100644 -index 00000000..4dcf6242 +index 000000000..4dcf6242c --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/event/profile/PreLookupProfileEvent.java @@ -0,0 +1,108 @@ diff --git a/Spigot-API-Patches/0059-Entity-fromMobSpawner.patch b/Spigot-API-Patches/0059-Entity-fromMobSpawner.patch index 5ff84e41c6..572fbb6cef 100644 --- a/Spigot-API-Patches/0059-Entity-fromMobSpawner.patch +++ b/Spigot-API-Patches/0059-Entity-fromMobSpawner.patch @@ -1,11 +1,11 @@ -From 2fca0ae8869cce83cf6c22fc95e0d6b8a9a9f17a Mon Sep 17 00:00:00 2001 +From 29ccdf625a3c47d48b473656b5230c477d9574c9 Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Sun, 18 Jun 2017 18:17:05 -0500 Subject: [PATCH] Entity#fromMobSpawner() diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java -index c8439d64..35d0909b 100644 +index c8439d644..35d0909b1 100644 --- a/src/main/java/org/bukkit/entity/Entity.java +++ b/src/main/java/org/bukkit/entity/Entity.java @@ -617,5 +617,12 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent 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 953cc3b4fe..0ca8f7344f 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 27d64c363e7fdb673502b22a0763161af9aa4df6 Mon Sep 17 00:00:00 2001 +From e717711e99644f71dc52c8b8eba980106e5506cf Mon Sep 17 00:00:00 2001 From: Aikar Date: Sat, 10 Dec 2016 16:12:48 -0500 Subject: [PATCH] Improve the Saddle API for Horses @@ -8,7 +8,7 @@ and access their saddle state separately from an interface shared with Armor. diff --git a/src/main/java/org/bukkit/inventory/ArmoredHorseInventory.java b/src/main/java/org/bukkit/inventory/ArmoredHorseInventory.java new file mode 100644 -index 00000000..163ffe8f +index 000000000..163ffe8ff --- /dev/null +++ b/src/main/java/org/bukkit/inventory/ArmoredHorseInventory.java @@ -0,0 +1,21 @@ @@ -34,7 +34,7 @@ index 00000000..163ffe8f + void setArmor(@Nullable ItemStack stack); +} diff --git a/src/main/java/org/bukkit/inventory/HorseInventory.java b/src/main/java/org/bukkit/inventory/HorseInventory.java -index 608e99c4..53498deb 100644 +index 608e99c42..53498debe 100644 --- a/src/main/java/org/bukkit/inventory/HorseInventory.java +++ b/src/main/java/org/bukkit/inventory/HorseInventory.java @@ -5,20 +5,4 @@ import org.jetbrains.annotations.Nullable; @@ -60,7 +60,7 @@ index 608e99c4..53498deb 100644 -} +public interface HorseInventory extends AbstractHorseInventory, ArmoredHorseInventory {} diff --git a/src/main/java/org/bukkit/inventory/LlamaInventory.java b/src/main/java/org/bukkit/inventory/LlamaInventory.java -index 2fa2c9d0..5ac1afb8 100644 +index 2fa2c9d07..5ac1afb8a 100644 --- a/src/main/java/org/bukkit/inventory/LlamaInventory.java +++ b/src/main/java/org/bukkit/inventory/LlamaInventory.java @@ -6,7 +6,7 @@ import org.jetbrains.annotations.Nullable; @@ -74,7 +74,7 @@ index 2fa2c9d0..5ac1afb8 100644 * Gets the item in the llama's decor slot. diff --git a/src/main/java/org/bukkit/inventory/SaddledHorseInventory.java b/src/main/java/org/bukkit/inventory/SaddledHorseInventory.java new file mode 100644 -index 00000000..7944f26a +index 000000000..7944f26a3 --- /dev/null +++ b/src/main/java/org/bukkit/inventory/SaddledHorseInventory.java @@ -0,0 +1,3 @@ diff --git a/Spigot-API-Patches/0061-ensureServerConversions-API.patch b/Spigot-API-Patches/0061-ensureServerConversions-API.patch index 84b05ef666..fdc9dafb0f 100644 --- a/Spigot-API-Patches/0061-ensureServerConversions-API.patch +++ b/Spigot-API-Patches/0061-ensureServerConversions-API.patch @@ -1,4 +1,4 @@ -From 005245b4911271b4f13791ff70746dc694f9b531 Mon Sep 17 00:00:00 2001 +From a1e4c9a771b5827464c1e538b2452ed09116bac1 Mon Sep 17 00:00:00 2001 From: Aikar Date: Wed, 4 May 2016 23:55:48 -0400 Subject: [PATCH] ensureServerConversions API @@ -7,7 +7,7 @@ This will take a Bukkit ItemStack and run it through any conversions a server pr to ensure it meets latest minecraft expectations. diff --git a/src/main/java/org/bukkit/inventory/ItemFactory.java b/src/main/java/org/bukkit/inventory/ItemFactory.java -index cbcbe8c8..8e602cf5 100644 +index 4ff149fd9..bb3f7cdc1 100644 --- a/src/main/java/org/bukkit/inventory/ItemFactory.java +++ b/src/main/java/org/bukkit/inventory/ItemFactory.java @@ -141,4 +141,17 @@ public interface ItemFactory { @@ -29,7 +29,7 @@ index cbcbe8c8..8e602cf5 100644 + // Paper end } diff --git a/src/main/java/org/bukkit/inventory/ItemStack.java b/src/main/java/org/bukkit/inventory/ItemStack.java -index bab86d80..44f3bec7 100644 +index bab86d804..44f3bec7d 100644 --- a/src/main/java/org/bukkit/inventory/ItemStack.java +++ b/src/main/java/org/bukkit/inventory/ItemStack.java @@ -518,7 +518,7 @@ public class ItemStack implements Cloneable, ConfigurationSerializable { diff --git a/Spigot-API-Patches/0062-Add-getI18NDisplayName-API.patch b/Spigot-API-Patches/0062-Add-getI18NDisplayName-API.patch index 765b375b71..bc34ded26f 100644 --- a/Spigot-API-Patches/0062-Add-getI18NDisplayName-API.patch +++ b/Spigot-API-Patches/0062-Add-getI18NDisplayName-API.patch @@ -1,4 +1,4 @@ -From 5fee301aedb1cbdf582295f335c237a142e82865 Mon Sep 17 00:00:00 2001 +From 7061ed771605cf3d3692e26673ad86570b054d26 Mon Sep 17 00:00:00 2001 From: Aikar Date: Wed, 4 May 2016 23:55:48 -0400 Subject: [PATCH] Add getI18NDisplayName API @@ -8,7 +8,7 @@ Currently the server only supports the English language. To override this, You must replace the language file embedded in the server jar. diff --git a/src/main/java/org/bukkit/inventory/ItemFactory.java b/src/main/java/org/bukkit/inventory/ItemFactory.java -index 8e602cf5..dca77bba 100644 +index bb3f7cdc1..3cada3487 100644 --- a/src/main/java/org/bukkit/inventory/ItemFactory.java +++ b/src/main/java/org/bukkit/inventory/ItemFactory.java @@ -153,5 +153,16 @@ public interface ItemFactory { @@ -29,7 +29,7 @@ index 8e602cf5..dca77bba 100644 // Paper end } diff --git a/src/main/java/org/bukkit/inventory/ItemStack.java b/src/main/java/org/bukkit/inventory/ItemStack.java -index 44f3bec7..9526cfe0 100644 +index 44f3bec7d..9526cfe02 100644 --- a/src/main/java/org/bukkit/inventory/ItemStack.java +++ b/src/main/java/org/bukkit/inventory/ItemStack.java @@ -591,5 +591,17 @@ public class ItemStack implements Cloneable, ConfigurationSerializable { diff --git a/Spigot-API-Patches/0063-ProfileWhitelistVerifyEvent.patch b/Spigot-API-Patches/0063-ProfileWhitelistVerifyEvent.patch index 52d8a0688c..015a973f76 100644 --- a/Spigot-API-Patches/0063-ProfileWhitelistVerifyEvent.patch +++ b/Spigot-API-Patches/0063-ProfileWhitelistVerifyEvent.patch @@ -1,4 +1,4 @@ -From 0ee9a5961484c254e1c97c7ce215a9a48da3cb90 Mon Sep 17 00:00:00 2001 +From 740e174fe3dfca46ff46de73771fd8de292339d8 Mon Sep 17 00:00:00 2001 From: Aikar Date: Mon, 3 Jul 2017 18:11:34 -0500 Subject: [PATCH] ProfileWhitelistVerifyEvent @@ -9,7 +9,7 @@ Allows you to do dynamic whitelisting and change of kick message diff --git a/src/main/java/com/destroystokyo/paper/event/profile/ProfileWhitelistVerifyEvent.java b/src/main/java/com/destroystokyo/paper/event/profile/ProfileWhitelistVerifyEvent.java new file mode 100644 -index 00000000..b1017628 +index 000000000..b10176289 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/event/profile/ProfileWhitelistVerifyEvent.java @@ -0,0 +1,117 @@ diff --git a/Spigot-API-Patches/0064-Make-plugins-list-alphabetical.patch b/Spigot-API-Patches/0064-Make-plugins-list-alphabetical.patch index e30a69736b..fe0fedd585 100644 --- a/Spigot-API-Patches/0064-Make-plugins-list-alphabetical.patch +++ b/Spigot-API-Patches/0064-Make-plugins-list-alphabetical.patch @@ -1,11 +1,11 @@ -From 7e6884097c480972ee63619950c2f45be6042865 Mon Sep 17 00:00:00 2001 +From 0999a170395516445aa9da71a80e50546e463d7a Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Mon, 31 Jul 2017 02:08:55 -0500 Subject: [PATCH] Make /plugins list alphabetical diff --git a/src/main/java/org/bukkit/command/defaults/PluginsCommand.java b/src/main/java/org/bukkit/command/defaults/PluginsCommand.java -index 11fbd0e0..d4e74d29 100644 +index 11fbd0e0c..d4e74d292 100644 --- a/src/main/java/org/bukkit/command/defaults/PluginsCommand.java +++ b/src/main/java/org/bukkit/command/defaults/PluginsCommand.java @@ -3,6 +3,9 @@ package org.bukkit.command.defaults; diff --git a/Spigot-API-Patches/0065-LivingEntity-setKiller.patch b/Spigot-API-Patches/0065-LivingEntity-setKiller.patch index 8306d6d8b4..7f70a4c648 100644 --- a/Spigot-API-Patches/0065-LivingEntity-setKiller.patch +++ b/Spigot-API-Patches/0065-LivingEntity-setKiller.patch @@ -1,11 +1,11 @@ -From 7f8b71c8dd1d8cd60348ee5bedcb155a6ed92c55 Mon Sep 17 00:00:00 2001 +From ee435e2da2a015c2e42cb98b9739b9749d3467c1 Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Mon, 31 Jul 2017 01:49:43 -0500 Subject: [PATCH] LivingEntity#setKiller diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java -index 2a4e4cb39..ba7881a27 100644 +index 5697728ce..ffbf3d7a8 100644 --- a/src/main/java/org/bukkit/entity/LivingEntity.java +++ b/src/main/java/org/bukkit/entity/LivingEntity.java @@ -250,6 +250,15 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource 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 13f78a4d89..cf7e65f0fe 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 b733f821905e9d3385d6e20ff17a6a07e652741a Mon Sep 17 00:00:00 2001 +From 8c3baea68032f5add44014796c416d5ffd9e892e Mon Sep 17 00:00:00 2001 From: Minecrell Date: Thu, 21 Sep 2017 16:14:13 +0200 Subject: [PATCH] Handle plugin prefixes in implementation logging @@ -17,7 +17,7 @@ The implementation should handle plugin prefixes by displaying logger names when appropriate. diff --git a/src/main/java/org/bukkit/plugin/java/JavaPlugin.java b/src/main/java/org/bukkit/plugin/java/JavaPlugin.java -index 22319005..bb2e55e9 100644 +index 223190054..bb2e55e97 100644 --- a/src/main/java/org/bukkit/plugin/java/JavaPlugin.java +++ b/src/main/java/org/bukkit/plugin/java/JavaPlugin.java @@ -42,7 +42,7 @@ public abstract class JavaPlugin extends PluginBase { 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 ebb97a2c26..d5197f800d 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 f7a220fa4c20104eba993f5b963526ae0b91cdaa Mon Sep 17 00:00:00 2001 +From b80b487f6e0b342dd8e92c51bf0c30654c4d961c 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 aceb6bbb..dbbb5c72 100644 +index 94173d328..4b8334d62 100644 --- a/pom.xml +++ b/pom.xml @@ -110,6 +110,13 @@ @@ -32,7 +32,7 @@ index aceb6bbb..dbbb5c72 100644 junit diff --git a/src/main/java/org/bukkit/plugin/Plugin.java b/src/main/java/org/bukkit/plugin/Plugin.java -index febfec6e..79890c68 100644 +index febfec6ef..79890c68f 100644 --- a/src/main/java/org/bukkit/plugin/Plugin.java +++ b/src/main/java/org/bukkit/plugin/Plugin.java @@ -166,6 +166,13 @@ public interface Plugin extends TabExecutor { 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 328f0ae158..6f5f54fd81 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 8cc0cf9092f9b58e9f7cf6f1cd8b5bda990b7d3d Mon Sep 17 00:00:00 2001 +From 9bd539b6bfd407871c33f53045ef9754385250e2 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 @@ -14,7 +14,7 @@ parent of the plugin logger to avoid this. diff --git a/src/main/java/com/destroystokyo/paper/utils/PaperPluginLogger.java b/src/main/java/com/destroystokyo/paper/utils/PaperPluginLogger.java new file mode 100644 -index 00000000..76f2cb9c +index 000000000..76f2cb9cd --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/utils/PaperPluginLogger.java @@ -0,0 +1,41 @@ @@ -60,7 +60,7 @@ index 00000000..76f2cb9c + +} diff --git a/src/main/java/org/bukkit/plugin/java/JavaPlugin.java b/src/main/java/org/bukkit/plugin/java/JavaPlugin.java -index bb2e55e9..04fa3991 100644 +index bb2e55e97..04fa3991f 100644 --- a/src/main/java/org/bukkit/plugin/java/JavaPlugin.java +++ b/src/main/java/org/bukkit/plugin/java/JavaPlugin.java @@ -42,7 +42,7 @@ public abstract class JavaPlugin extends PluginBase { @@ -87,7 +87,7 @@ index bb2e55e9..04fa3991 100644 /** diff --git a/src/main/java/org/bukkit/plugin/java/PluginClassLoader.java b/src/main/java/org/bukkit/plugin/java/PluginClassLoader.java -index b859796b..6f39f571 100644 +index b859796b4..6f39f571d 100644 --- a/src/main/java/org/bukkit/plugin/java/PluginClassLoader.java +++ b/src/main/java/org/bukkit/plugin/java/PluginClassLoader.java @@ -37,6 +37,7 @@ public final class PluginClassLoader extends URLClassLoader { // Spigot diff --git a/Spigot-API-Patches/0069-Add-PlayerJumpEvent.patch b/Spigot-API-Patches/0069-Add-PlayerJumpEvent.patch index 2a767e5106..bcdf282707 100644 --- a/Spigot-API-Patches/0069-Add-PlayerJumpEvent.patch +++ b/Spigot-API-Patches/0069-Add-PlayerJumpEvent.patch @@ -1,4 +1,4 @@ -From e1a030f03aec0d3f4659ff005dd004adda025de0 Mon Sep 17 00:00:00 2001 +From f531bdf527427587ebab5d6f8b4013fa4e9849cc Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Thu, 28 Sep 2017 17:21:32 -0400 Subject: [PATCH] Add PlayerJumpEvent @@ -6,7 +6,7 @@ Subject: [PATCH] Add PlayerJumpEvent diff --git a/src/main/java/com/destroystokyo/paper/event/player/PlayerJumpEvent.java b/src/main/java/com/destroystokyo/paper/event/player/PlayerJumpEvent.java new file mode 100644 -index 00000000..289a0d78 +index 000000000..289a0d784 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/event/player/PlayerJumpEvent.java @@ -0,0 +1,106 @@ 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 2ebd6adb04..b492c35e95 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 f0f9d92355cf99f298ffb63c693b6c9b410052ed Mon Sep 17 00:00:00 2001 +From daca7640762ec77783db4485f7e214f6582bb629 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 @@ -11,7 +11,7 @@ Add a NetworkClient interface that provides access to: diff --git a/src/main/java/com/destroystokyo/paper/network/NetworkClient.java b/src/main/java/com/destroystokyo/paper/network/NetworkClient.java new file mode 100644 -index 00000000..7b2af1bd +index 000000000..7b2af1bd7 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/network/NetworkClient.java @@ -0,0 +1,41 @@ @@ -57,7 +57,7 @@ index 00000000..7b2af1bd + +} diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java -index c21785d5..247ed072 100644 +index 290b9d75d..d8cc7d5db 100644 --- a/src/main/java/org/bukkit/entity/Player.java +++ b/src/main/java/org/bukkit/entity/Player.java @@ -31,7 +31,7 @@ import org.jetbrains.annotations.Nullable; diff --git a/Spigot-API-Patches/0071-Add-PlayerArmorChangeEvent.patch b/Spigot-API-Patches/0071-Add-PlayerArmorChangeEvent.patch index 83a09c351f..7b1d828f65 100644 --- a/Spigot-API-Patches/0071-Add-PlayerArmorChangeEvent.patch +++ b/Spigot-API-Patches/0071-Add-PlayerArmorChangeEvent.patch @@ -1,4 +1,4 @@ -From 986fa3f55231a220bf061a5c79084e00a73396d0 Mon Sep 17 00:00:00 2001 +From cf64cdc270c4353101199def6de75d2562531b70 Mon Sep 17 00:00:00 2001 From: pkt77 Date: Fri, 10 Nov 2017 23:45:59 -0500 Subject: [PATCH] Add PlayerArmorChangeEvent @@ -6,7 +6,7 @@ Subject: [PATCH] Add PlayerArmorChangeEvent diff --git a/src/main/java/com/destroystokyo/paper/event/player/PlayerArmorChangeEvent.java b/src/main/java/com/destroystokyo/paper/event/player/PlayerArmorChangeEvent.java new file mode 100644 -index 00000000..2827a100 +index 000000000..2827a1002 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/event/player/PlayerArmorChangeEvent.java @@ -0,0 +1,137 @@ 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 85172f4f73..2e283e9256 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 fac60bf80e0ed4e37e2f15a662fcabc2881e80ba Mon Sep 17 00:00:00 2001 +From 9d5cf099a8a97080096bcaed6068e52abf368ec0 Mon Sep 17 00:00:00 2001 From: Aikar Date: Mon, 6 Nov 2017 21:10:01 -0500 Subject: [PATCH] API to get a BlockState without a snapshot @@ -9,7 +9,7 @@ on the real tile entity. This is useful for where performance is needed diff --git a/src/main/java/org/bukkit/block/Block.java b/src/main/java/org/bukkit/block/Block.java -index ab6750c7..af4ffada 100644 +index ab6750c7a..af4ffada0 100644 --- a/src/main/java/org/bukkit/block/Block.java +++ b/src/main/java/org/bukkit/block/Block.java @@ -268,6 +268,16 @@ public interface Block extends Metadatable { diff --git a/Spigot-API-Patches/0073-AsyncTabCompleteEvent.patch b/Spigot-API-Patches/0073-AsyncTabCompleteEvent.patch index 1300923a32..e4ecc4f854 100644 --- a/Spigot-API-Patches/0073-AsyncTabCompleteEvent.patch +++ b/Spigot-API-Patches/0073-AsyncTabCompleteEvent.patch @@ -1,4 +1,4 @@ -From c9fa8f5324751e3b6443539634b888fffdf3044b Mon Sep 17 00:00:00 2001 +From 228dbeba8577e66ae552702277c3ec51e2d504b1 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sun, 26 Nov 2017 13:17:09 -0500 Subject: [PATCH] AsyncTabCompleteEvent @@ -13,7 +13,7 @@ completion, such as offline players. diff --git a/src/main/java/com/destroystokyo/paper/event/server/AsyncTabCompleteEvent.java b/src/main/java/com/destroystokyo/paper/event/server/AsyncTabCompleteEvent.java new file mode 100644 -index 00000000..619ed371 +index 000000000..619ed3716 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/event/server/AsyncTabCompleteEvent.java @@ -0,0 +1,177 @@ @@ -195,7 +195,7 @@ index 00000000..619ed371 + } +} diff --git a/src/main/java/org/bukkit/event/server/TabCompleteEvent.java b/src/main/java/org/bukkit/event/server/TabCompleteEvent.java -index d1a9956a..f96c4ba5 100644 +index d1a9956a1..f96c4ba53 100644 --- a/src/main/java/org/bukkit/event/server/TabCompleteEvent.java +++ b/src/main/java/org/bukkit/event/server/TabCompleteEvent.java @@ -1,5 +1,6 @@ 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 fcf132e749..4e3add452c 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 6fa61bcbd8768d7501dea34c48490992d4edc2a4 Mon Sep 17 00:00:00 2001 +From 7fd7423b000808b40f37c79b3a6972b4502d4542 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sat, 9 Dec 2017 12:40:25 -0500 Subject: [PATCH] Display warning on deprecated recipe API @@ -10,7 +10,7 @@ on the players login. Plugin authors need to define a key to keep it consistent between server restarts. diff --git a/src/main/java/org/bukkit/inventory/ShapedRecipe.java b/src/main/java/org/bukkit/inventory/ShapedRecipe.java -index d74b3114..d742c405 100644 +index d74b3114f..d742c4058 100644 --- a/src/main/java/org/bukkit/inventory/ShapedRecipe.java +++ b/src/main/java/org/bukkit/inventory/ShapedRecipe.java @@ -25,6 +25,7 @@ public class ShapedRecipe implements Recipe, Keyed { @@ -22,7 +22,7 @@ index d74b3114..d742c405 100644 } diff --git a/src/main/java/org/bukkit/inventory/ShapelessRecipe.java b/src/main/java/org/bukkit/inventory/ShapelessRecipe.java -index 68447fb8..84062dd7 100644 +index 68447fb8c..84062dd71 100644 --- a/src/main/java/org/bukkit/inventory/ShapelessRecipe.java +++ b/src/main/java/org/bukkit/inventory/ShapelessRecipe.java @@ -26,6 +26,7 @@ public class ShapelessRecipe implements Recipe, Keyed { diff --git a/Spigot-API-Patches/0075-PlayerPickupExperienceEvent.patch b/Spigot-API-Patches/0075-PlayerPickupExperienceEvent.patch index 9afab0cf90..71d615cbac 100644 --- a/Spigot-API-Patches/0075-PlayerPickupExperienceEvent.patch +++ b/Spigot-API-Patches/0075-PlayerPickupExperienceEvent.patch @@ -1,4 +1,4 @@ -From 25b565fcee0be8aba234ef72d4e6b5ad303ef72a Mon Sep 17 00:00:00 2001 +From c2787b0f711c5da60d2308e016b47dbc5a7998a6 Mon Sep 17 00:00:00 2001 From: Aikar Date: Tue, 19 Dec 2017 22:00:41 -0500 Subject: [PATCH] PlayerPickupExperienceEvent @@ -7,7 +7,7 @@ Allows plugins to cancel a player picking up an experience orb diff --git a/src/main/java/com/destroystokyo/paper/event/player/PlayerPickupExperienceEvent.java b/src/main/java/com/destroystokyo/paper/event/player/PlayerPickupExperienceEvent.java new file mode 100644 -index 00000000..f7beb22d +index 000000000..f7beb22d5 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/event/player/PlayerPickupExperienceEvent.java @@ -0,0 +1,80 @@ diff --git a/Spigot-API-Patches/0076-ExperienceOrbMergeEvent.patch b/Spigot-API-Patches/0076-ExperienceOrbMergeEvent.patch index 5f0e6a029a..e38601bb17 100644 --- a/Spigot-API-Patches/0076-ExperienceOrbMergeEvent.patch +++ b/Spigot-API-Patches/0076-ExperienceOrbMergeEvent.patch @@ -1,4 +1,4 @@ -From 9abbd1fad3e1556130905142de3c6649688f2993 Mon Sep 17 00:00:00 2001 +From 68ad8eef47105e5180b4f52f2226123c61b6d252 Mon Sep 17 00:00:00 2001 From: Aikar Date: Tue, 19 Dec 2017 22:56:24 -0500 Subject: [PATCH] ExperienceOrbMergeEvent @@ -9,7 +9,7 @@ metadata such as spawn reason, or conditionally move data from source to target. diff --git a/src/main/java/com/destroystokyo/paper/event/entity/ExperienceOrbMergeEvent.java b/src/main/java/com/destroystokyo/paper/event/entity/ExperienceOrbMergeEvent.java new file mode 100644 -index 00000000..0ce3e397 +index 000000000..0ce3e3977 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/event/entity/ExperienceOrbMergeEvent.java @@ -0,0 +1,87 @@ 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 c31f97bea2..7d044cb99b 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 d9f8be3f0027a03340b60ccde44a253048eceeb7 Mon Sep 17 00:00:00 2001 +From 2997e482c0c100a5782713ce6aeec2d7af8c0ffc Mon Sep 17 00:00:00 2001 From: Aikar Date: Wed, 20 Dec 2017 17:38:07 -0500 Subject: [PATCH] Ability to apply mending to XP API @@ -10,7 +10,7 @@ of giving the player experience points. Both an API To standalone mend, and apply mending logic to .giveExp has been added. diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java -index b90e211a..df1d3c78 100644 +index d8cc7d5db..7d6cfb05d 100644 --- a/src/main/java/org/bukkit/entity/Player.java +++ b/src/main/java/org/bukkit/entity/Player.java @@ -947,12 +947,33 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM diff --git a/Spigot-API-Patches/0078-PreCreatureSpawnEvent.patch b/Spigot-API-Patches/0078-PreCreatureSpawnEvent.patch index 31cb2a0265..683454bb2a 100644 --- a/Spigot-API-Patches/0078-PreCreatureSpawnEvent.patch +++ b/Spigot-API-Patches/0078-PreCreatureSpawnEvent.patch @@ -1,4 +1,4 @@ -From 69201b817c39c9959a8e0154f99be75bf825a72d Mon Sep 17 00:00:00 2001 +From 8c5bb2003e483c51a5dde8096959a5062a44b73a Mon Sep 17 00:00:00 2001 From: Aikar Date: Sun, 14 Jan 2018 16:59:43 -0500 Subject: [PATCH] PreCreatureSpawnEvent @@ -16,7 +16,7 @@ See: https://github.com/PaperMC/Paper/issues/917 diff --git a/src/main/java/com/destroystokyo/paper/event/entity/PreCreatureSpawnEvent.java b/src/main/java/com/destroystokyo/paper/event/entity/PreCreatureSpawnEvent.java new file mode 100644 -index 00000000..d5edde9c +index 000000000..d5edde9cd --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/event/entity/PreCreatureSpawnEvent.java @@ -0,0 +1,104 @@ diff --git a/Spigot-API-Patches/0079-PlayerNaturallySpawnCreaturesEvent.patch b/Spigot-API-Patches/0079-PlayerNaturallySpawnCreaturesEvent.patch index 79c3d3a286..a5509d8c88 100644 --- a/Spigot-API-Patches/0079-PlayerNaturallySpawnCreaturesEvent.patch +++ b/Spigot-API-Patches/0079-PlayerNaturallySpawnCreaturesEvent.patch @@ -1,4 +1,4 @@ -From 65cbe82faadc65085e95f13e83fc7e6a018100d4 Mon Sep 17 00:00:00 2001 +From fcf0bc255f96be29984c13473c0f0545db3f63d5 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sun, 14 Jan 2018 17:31:37 -0500 Subject: [PATCH] PlayerNaturallySpawnCreaturesEvent @@ -10,7 +10,7 @@ Also a highly more effecient way to blanket block spawns in a world diff --git a/src/main/java/com/destroystokyo/paper/event/entity/PlayerNaturallySpawnCreaturesEvent.java b/src/main/java/com/destroystokyo/paper/event/entity/PlayerNaturallySpawnCreaturesEvent.java new file mode 100644 -index 00000000..112a0dbf +index 000000000..112a0dbf5 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/event/entity/PlayerNaturallySpawnCreaturesEvent.java @@ -0,0 +1,64 @@ 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 70136e6929..161831a722 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 17f04473ae82c2ae90cca24a5f7fce0bbb5855e8 Mon Sep 17 00:00:00 2001 +From 33ee96aa37c781c3707f0ff8e43b7a2a38bd0fd8 Mon Sep 17 00:00:00 2001 From: Aikar Date: Fri, 19 Jan 2018 00:29:28 -0500 Subject: [PATCH] Add setPlayerProfile API for Skulls @@ -7,7 +7,7 @@ This allows you to create already filled textures on Skulls to avoid texture loo which commonly cause rate limit issues with Mojang API diff --git a/src/main/java/org/bukkit/block/Skull.java b/src/main/java/org/bukkit/block/Skull.java -index 943d751f..a6914f01 100644 +index 943d751fb..a6914f01e 100644 --- a/src/main/java/org/bukkit/block/Skull.java +++ b/src/main/java/org/bukkit/block/Skull.java @@ -7,6 +7,7 @@ import org.bukkit.block.data.BlockData; @@ -40,7 +40,7 @@ index 943d751f..a6914f01 100644 * Gets the rotation of the skull in the world (or facing direction if this * is a wall mounted skull). diff --git a/src/main/java/org/bukkit/inventory/meta/SkullMeta.java b/src/main/java/org/bukkit/inventory/meta/SkullMeta.java -index 35a39203..8b2465ea 100644 +index 35a392033..8b2465ea2 100644 --- a/src/main/java/org/bukkit/inventory/meta/SkullMeta.java +++ b/src/main/java/org/bukkit/inventory/meta/SkullMeta.java @@ -1,9 +1,11 @@ diff --git a/Spigot-API-Patches/0081-Fill-Profile-Property-Events.patch b/Spigot-API-Patches/0081-Fill-Profile-Property-Events.patch index 7ca44fd0a3..2eb6ff4fce 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 85b20f933f2c008a358b790e2a554b69e34d12bf Mon Sep 17 00:00:00 2001 +From ead8e433f9e52b5b867884e2cb1cfabecb3d556d Mon Sep 17 00:00:00 2001 From: Aikar Date: Tue, 2 Jan 2018 00:31:08 -0500 Subject: [PATCH] Fill Profile Property Events @@ -12,7 +12,7 @@ This is useful for implementing a ProfileCache for Player Skulls diff --git a/src/main/java/com/destroystokyo/paper/event/profile/FillProfileEvent.java b/src/main/java/com/destroystokyo/paper/event/profile/FillProfileEvent.java new file mode 100644 -index 00000000..71f36e9c +index 000000000..71f36e9ca --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/event/profile/FillProfileEvent.java @@ -0,0 +1,75 @@ @@ -93,7 +93,7 @@ index 00000000..71f36e9c +} diff --git a/src/main/java/com/destroystokyo/paper/event/profile/PreFillProfileEvent.java b/src/main/java/com/destroystokyo/paper/event/profile/PreFillProfileEvent.java new file mode 100644 -index 00000000..021bc863 +index 000000000..021bc8631 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/event/profile/PreFillProfileEvent.java @@ -0,0 +1,77 @@ diff --git a/Spigot-API-Patches/0082-PlayerAdvancementCriterionGrantEvent.patch b/Spigot-API-Patches/0082-PlayerAdvancementCriterionGrantEvent.patch index 6433159fac..aace1e1a27 100644 --- a/Spigot-API-Patches/0082-PlayerAdvancementCriterionGrantEvent.patch +++ b/Spigot-API-Patches/0082-PlayerAdvancementCriterionGrantEvent.patch @@ -1,4 +1,4 @@ -From cbfc65bf36d39478f9809431b9610ebec21bd699 Mon Sep 17 00:00:00 2001 +From 157fc2d86718ec7fa405abbc73791ff2d0db919e Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Fri, 19 Jan 2018 08:15:14 -0600 Subject: [PATCH] PlayerAdvancementCriterionGrantEvent @@ -6,7 +6,7 @@ Subject: [PATCH] PlayerAdvancementCriterionGrantEvent diff --git a/src/main/java/com/destroystokyo/paper/event/player/PlayerAdvancementCriterionGrantEvent.java b/src/main/java/com/destroystokyo/paper/event/player/PlayerAdvancementCriterionGrantEvent.java new file mode 100644 -index 00000000..bb8d7c95 +index 000000000..bb8d7c959 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/event/player/PlayerAdvancementCriterionGrantEvent.java @@ -0,0 +1,63 @@ diff --git a/Spigot-API-Patches/0083-Add-ArmorStand-Item-Meta.patch b/Spigot-API-Patches/0083-Add-ArmorStand-Item-Meta.patch index fe05691620..e13034e247 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 11d6f5499f0a3d3c885d5de311c57ab98403309e Mon Sep 17 00:00:00 2001 +From 46b764af9db79c78d639d08e797c28dcd93ec981 Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Sat, 27 Jan 2018 17:06:24 -0500 Subject: [PATCH] Add ArmorStand Item Meta @@ -12,7 +12,7 @@ starting point for future additions in this area. diff --git a/src/main/java/com/destroystokyo/paper/inventory/meta/ArmorStandMeta.java b/src/main/java/com/destroystokyo/paper/inventory/meta/ArmorStandMeta.java new file mode 100644 -index 00000000..7e4acfff +index 000000000..7e4acfff1 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/inventory/meta/ArmorStandMeta.java @@ -0,0 +1,78 @@ diff --git a/Spigot-API-Patches/0084-Optimize-Hoppers.patch b/Spigot-API-Patches/0084-Optimize-Hoppers.patch index 5079057f46..defeb73bce 100644 --- a/Spigot-API-Patches/0084-Optimize-Hoppers.patch +++ b/Spigot-API-Patches/0084-Optimize-Hoppers.patch @@ -1,4 +1,4 @@ -From a8182f37635d55f5c7c37fed994fbbebe10aafe4 Mon Sep 17 00:00:00 2001 +From 9a156e6947b5c9c31a983dcee2670e4bc7c3aee3 Mon Sep 17 00:00:00 2001 From: Aikar Date: Thu, 18 Jan 2018 01:00:27 -0500 Subject: [PATCH] Optimize Hoppers @@ -7,7 +7,7 @@ Adds data about what Item related methods were used in InventoryMoveItem event so that the server can improve the performance of this event. diff --git a/src/main/java/org/bukkit/event/inventory/InventoryMoveItemEvent.java b/src/main/java/org/bukkit/event/inventory/InventoryMoveItemEvent.java -index 2bb57d23..f0a16d3c 100644 +index a8c48f5a4..04d4a83bf 100644 --- a/src/main/java/org/bukkit/event/inventory/InventoryMoveItemEvent.java +++ b/src/main/java/org/bukkit/event/inventory/InventoryMoveItemEvent.java @@ -31,6 +31,8 @@ public class InventoryMoveItemEvent extends Event implements Cancellable { diff --git a/Spigot-API-Patches/0085-Tameable-getOwnerUniqueId-API.patch b/Spigot-API-Patches/0085-Tameable-getOwnerUniqueId-API.patch index b51ed9912d..5f51e273a3 100644 --- a/Spigot-API-Patches/0085-Tameable-getOwnerUniqueId-API.patch +++ b/Spigot-API-Patches/0085-Tameable-getOwnerUniqueId-API.patch @@ -1,4 +1,4 @@ -From 28f6a2a264377fbe9cc59db4d6c2726a71a219ba Mon Sep 17 00:00:00 2001 +From 5ce17867715b109030f8d6e968ce082239cf26a2 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sat, 24 Feb 2018 00:55:52 -0500 Subject: [PATCH] Tameable#getOwnerUniqueId API @@ -7,7 +7,7 @@ This is faster if all you need is the UUID, as .getOwner() will cause an OfflinePlayer to be loaded from disk. diff --git a/src/main/java/org/bukkit/entity/Tameable.java b/src/main/java/org/bukkit/entity/Tameable.java -index 0c066bdf..be436f8d 100644 +index 0c066bdfc..be436f8df 100644 --- a/src/main/java/org/bukkit/entity/Tameable.java +++ b/src/main/java/org/bukkit/entity/Tameable.java @@ -1,5 +1,6 @@ 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 2e05d2b50e..592507ffcb 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 06e1fa0b4f1afd1a8b56b6f3355f922511c4bdc7 Mon Sep 17 00:00:00 2001 +From 03ae0f31ff5b17555697b06a1178beb408cd3fc2 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sun, 18 Mar 2018 11:43:30 -0400 Subject: [PATCH] Ability to change PlayerProfile in AsyncPreLoginEvent @@ -6,7 +6,7 @@ Subject: [PATCH] Ability to change PlayerProfile in AsyncPreLoginEvent This will allow you to change the players name or skin on login. diff --git a/src/main/java/org/bukkit/event/player/AsyncPlayerPreLoginEvent.java b/src/main/java/org/bukkit/event/player/AsyncPlayerPreLoginEvent.java -index c8384da6..6c09ea6c 100644 +index c8384da69..6c09ea6c6 100644 --- a/src/main/java/org/bukkit/event/player/AsyncPlayerPreLoginEvent.java +++ b/src/main/java/org/bukkit/event/player/AsyncPlayerPreLoginEvent.java @@ -2,6 +2,9 @@ package org.bukkit.event.player; diff --git a/Spigot-API-Patches/0087-Add-extended-PaperServerListPingEvent.patch b/Spigot-API-Patches/0087-Add-extended-PaperServerListPingEvent.patch index 9cc9cbe2fc..5e60a55184 100644 --- a/Spigot-API-Patches/0087-Add-extended-PaperServerListPingEvent.patch +++ b/Spigot-API-Patches/0087-Add-extended-PaperServerListPingEvent.patch @@ -1,4 +1,4 @@ -From b5061941a927a849f90007afd1a6fea267b639ef Mon Sep 17 00:00:00 2001 +From a1ea7d82c8bcc6a79ce00cf190d56535c0c58488 Mon Sep 17 00:00:00 2001 From: Minecrell Date: Wed, 11 Oct 2017 15:55:38 +0200 Subject: [PATCH] Add extended PaperServerListPingEvent @@ -8,7 +8,7 @@ and allows full control of the response sent to the client. diff --git a/src/main/java/com/destroystokyo/paper/event/server/PaperServerListPingEvent.java b/src/main/java/com/destroystokyo/paper/event/server/PaperServerListPingEvent.java new file mode 100644 -index 00000000..0cc5dd57 +index 000000000..0cc5dd573 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/event/server/PaperServerListPingEvent.java @@ -0,0 +1,323 @@ @@ -337,7 +337,7 @@ index 00000000..0cc5dd57 +} diff --git a/src/main/java/com/destroystokyo/paper/network/StatusClient.java b/src/main/java/com/destroystokyo/paper/network/StatusClient.java new file mode 100644 -index 00000000..517d1523 +index 000000000..517d15238 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/network/StatusClient.java @@ -0,0 +1,13 @@ @@ -355,7 +355,7 @@ index 00000000..517d1523 + +} diff --git a/src/main/java/org/bukkit/util/CachedServerIcon.java b/src/main/java/org/bukkit/util/CachedServerIcon.java -index 612958a3..bb4f7702 100644 +index 612958a33..bb4f7702c 100644 --- a/src/main/java/org/bukkit/util/CachedServerIcon.java +++ b/src/main/java/org/bukkit/util/CachedServerIcon.java @@ -18,4 +18,9 @@ public interface CachedServerIcon { diff --git a/Spigot-API-Patches/0088-Player.setPlayerProfile-API.patch b/Spigot-API-Patches/0088-Player.setPlayerProfile-API.patch index e9944b569a..733f0efcbc 100644 --- a/Spigot-API-Patches/0088-Player.setPlayerProfile-API.patch +++ b/Spigot-API-Patches/0088-Player.setPlayerProfile-API.patch @@ -1,4 +1,4 @@ -From f31c5a5d3b3ac8b24e723d53ddee127d6f6260be Mon Sep 17 00:00:00 2001 +From 9b80b5d016ea9bb1d0f3bf3ae87bb37da03858dc Mon Sep 17 00:00:00 2001 From: Aikar Date: Sun, 18 Mar 2018 12:28:55 -0400 Subject: [PATCH] Player.setPlayerProfile API diff --git a/Spigot-API-Patches/0089-getPlayerUniqueId-API.patch b/Spigot-API-Patches/0089-getPlayerUniqueId-API.patch index 4ff8f7dcf2..71fa656ee9 100644 --- a/Spigot-API-Patches/0089-getPlayerUniqueId-API.patch +++ b/Spigot-API-Patches/0089-getPlayerUniqueId-API.patch @@ -1,4 +1,4 @@ -From 9d6cb9777a68d1b778b91e9b4bec65e489b00096 Mon Sep 17 00:00:00 2001 +From 055c2692f3638b4dde69db0813f2a80a6933ce5b Mon Sep 17 00:00:00 2001 From: Aikar Date: Thu, 22 Mar 2018 01:39:28 -0400 Subject: [PATCH] getPlayerUniqueId API @@ -9,7 +9,7 @@ In Offline Mode, will return an Offline UUID This is a more performant way to obtain a UUID for a name than loading an OfflinePlayer diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java -index 24b761fe..de42be5b 100644 +index 161a714e5..0c519c412 100644 --- a/src/main/java/org/bukkit/Bukkit.java +++ b/src/main/java/org/bukkit/Bukkit.java @@ -423,6 +423,20 @@ public final class Bukkit { @@ -34,7 +34,7 @@ index 24b761fe..de42be5b 100644 * Gets the plugin manager for interfacing with plugins. * diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java -index 9b767d7c..9c92517b 100644 +index 463724e40..8a76df524 100644 --- a/src/main/java/org/bukkit/Server.java +++ b/src/main/java/org/bukkit/Server.java @@ -356,6 +356,18 @@ public interface Server extends PluginMessageRecipient { 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 266106e295..a6e5bacafa 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 352d098f8b770b164eb59c7840b9b2d8290f67b2 Mon Sep 17 00:00:00 2001 +From 167ffd14b3c785b940cb71b2846a12650e5aad7e Mon Sep 17 00:00:00 2001 From: Minecrell Date: Wed, 11 Oct 2017 19:30:20 +0200 Subject: [PATCH] Add legacy ping support to PaperServerListPingEvent @@ -8,7 +8,7 @@ client that does not support all of the features provided in the event. diff --git a/src/main/java/com/destroystokyo/paper/network/StatusClient.java b/src/main/java/com/destroystokyo/paper/network/StatusClient.java -index 517d1523..ffda9f6a 100644 +index 517d15238..ffda9f6a8 100644 --- a/src/main/java/com/destroystokyo/paper/network/StatusClient.java +++ b/src/main/java/com/destroystokyo/paper/network/StatusClient.java @@ -10,4 +10,16 @@ import com.destroystokyo.paper.event.server.PaperServerListPingEvent; 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 971248bb9f..53b6e78f63 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 5ee5c9f828a151a39e2f0f715eb50582dd23560f Mon Sep 17 00:00:00 2001 +From c9ba674d7c0ac87d4a3002730eb2994643845732 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 5b5fb303..cdbac95b 100644 +index 5b5fb3034..cdbac95bb 100644 --- a/src/main/java/org/bukkit/entity/HumanEntity.java +++ b/src/main/java/org/bukkit/entity/HumanEntity.java @@ -458,4 +458,13 @@ public interface HumanEntity extends LivingEntity, AnimalTamer, InventoryHolder 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 dd99a608bf..e1965ff83b 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 a1b55ca0684c1e96cb4416abf7f5531e2c20c2f0 Mon Sep 17 00:00:00 2001 +From a685bd4c9220dc3c52cefaae61ea2b595a6085a0 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 @@ -8,7 +8,7 @@ Allows a more logical API for banning players. player.banPlayer("Breaking the rules"); diff --git a/src/main/java/org/bukkit/OfflinePlayer.java b/src/main/java/org/bukkit/OfflinePlayer.java -index ffc8ad37..222a9a7b 100644 +index ffc8ad373..222a9a7bf 100644 --- a/src/main/java/org/bukkit/OfflinePlayer.java +++ b/src/main/java/org/bukkit/OfflinePlayer.java @@ -44,6 +44,61 @@ public interface OfflinePlayer extends ServerOperator, AnimalTamer, Configuratio @@ -74,7 +74,7 @@ index ffc8ad37..222a9a7b 100644 /** * Checks if this player is whitelisted or not diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java -index ff799ac7..32dc1f86 100644 +index ff799ac78..32dc1f868 100644 --- a/src/main/java/org/bukkit/entity/Player.java +++ b/src/main/java/org/bukkit/entity/Player.java @@ -1,10 +1,15 @@ diff --git a/Spigot-API-Patches/0093-EndermanEscapeEvent.patch b/Spigot-API-Patches/0093-EndermanEscapeEvent.patch index f3485bf720..275a16a530 100644 --- a/Spigot-API-Patches/0093-EndermanEscapeEvent.patch +++ b/Spigot-API-Patches/0093-EndermanEscapeEvent.patch @@ -1,4 +1,4 @@ -From c1828ab1f99a94ec3c39f3aba13319f44cc2e7e4 Mon Sep 17 00:00:00 2001 +From 337a936d3a252e601ac12a47947949fadc4763d7 Mon Sep 17 00:00:00 2001 From: Aikar Date: Mon, 30 Apr 2018 13:14:30 -0400 Subject: [PATCH] EndermanEscapeEvent @@ -9,7 +9,7 @@ You may cancel this, enabling ranged attacks to damage the enderman for example. diff --git a/src/main/java/com/destroystokyo/paper/event/entity/EndermanEscapeEvent.java b/src/main/java/com/destroystokyo/paper/event/entity/EndermanEscapeEvent.java new file mode 100644 -index 00000000..806112a8 +index 000000000..806112a8b --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/event/entity/EndermanEscapeEvent.java @@ -0,0 +1,87 @@ diff --git a/Spigot-API-Patches/0094-Enderman.teleportRandomly.patch b/Spigot-API-Patches/0094-Enderman.teleportRandomly.patch index a336b64729..6b7c1cdc1f 100644 --- a/Spigot-API-Patches/0094-Enderman.teleportRandomly.patch +++ b/Spigot-API-Patches/0094-Enderman.teleportRandomly.patch @@ -1,4 +1,4 @@ -From 2a517ba291f4bce720c9c721a8a9a350741d6e80 Mon Sep 17 00:00:00 2001 +From 7d86f2a56d32bf62666299cbd999d07666fdc7c0 Mon Sep 17 00:00:00 2001 From: Aikar Date: Mon, 30 Apr 2018 13:29:15 -0400 Subject: [PATCH] Enderman.teleportRandomly() @@ -6,7 +6,7 @@ Subject: [PATCH] Enderman.teleportRandomly() Ability to trigger the vanilla "teleport randomly" mechanic of an enderman. diff --git a/src/main/java/org/bukkit/entity/Enderman.java b/src/main/java/org/bukkit/entity/Enderman.java -index bb325d9c..821c690f 100644 +index bb325d9c8..821c690f8 100644 --- a/src/main/java/org/bukkit/entity/Enderman.java +++ b/src/main/java/org/bukkit/entity/Enderman.java @@ -10,6 +10,17 @@ import org.jetbrains.annotations.Nullable; 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 02e00d34dd..f70eb0c9b0 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 69bf5e553110fa957385964199ece616895b9469 Mon Sep 17 00:00:00 2001 +From c647ff2d1ed9575d465edff26822a70319491c90 Mon Sep 17 00:00:00 2001 From: Aikar Date: Mon, 30 Apr 2018 17:55:28 -0400 Subject: [PATCH] Additional world.getNearbyEntities API's @@ -6,7 +6,7 @@ Subject: [PATCH] Additional world.getNearbyEntities API's Provides more methods to get nearby entities, and filter by types and predicates diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java -index 2fe46faf..e1e674ba 100644 +index 2fe46faf0..e1e674bab 100644 --- a/src/main/java/org/bukkit/World.java +++ b/src/main/java/org/bukkit/World.java @@ -1,6 +1,9 @@ @@ -277,7 +277,7 @@ index 2fe46faf..e1e674ba 100644 * Get a list of all players in this World * diff --git a/src/main/java/org/bukkit/event/player/AsyncPlayerPreLoginEvent.java b/src/main/java/org/bukkit/event/player/AsyncPlayerPreLoginEvent.java -index 6c09ea6c..76c4a1a6 100644 +index 6c09ea6c6..76c4a1a6e 100644 --- a/src/main/java/org/bukkit/event/player/AsyncPlayerPreLoginEvent.java +++ b/src/main/java/org/bukkit/event/player/AsyncPlayerPreLoginEvent.java @@ -42,8 +42,7 @@ public class AsyncPlayerPreLoginEvent extends Event { diff --git a/Spigot-API-Patches/0096-Location.isChunkLoaded-API.patch b/Spigot-API-Patches/0096-Location.isChunkLoaded-API.patch index 2dae096ee7..bb002b55fc 100644 --- a/Spigot-API-Patches/0096-Location.isChunkLoaded-API.patch +++ b/Spigot-API-Patches/0096-Location.isChunkLoaded-API.patch @@ -1,11 +1,11 @@ -From 947a4656a70657d309ba4c02c36a3b5277d5d4c6 Mon Sep 17 00:00:00 2001 +From 731d3b535ac7624e8ac1e601d3b9ee718407bd8f Mon Sep 17 00:00:00 2001 From: Aikar Date: Mon, 30 Apr 2018 19:27:31 -0400 Subject: [PATCH] Location.isChunkLoaded() API diff --git a/src/main/java/org/bukkit/Location.java b/src/main/java/org/bukkit/Location.java -index 44e3bca6..6021e672 100644 +index 44e3bca61..6021e6729 100644 --- a/src/main/java/org/bukkit/Location.java +++ b/src/main/java/org/bukkit/Location.java @@ -533,6 +533,7 @@ public class Location implements Cloneable, ConfigurationSerializable { 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 6bcf5129bd..940b5dd98f 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 b1e61a261f80eb5ec6ab010c0a9695ddfcd071a7 Mon Sep 17 00:00:00 2001 +From 91dd0dfff543594853c5b79b5c4b6a43ed1f797a Mon Sep 17 00:00:00 2001 From: Aikar Date: Tue, 29 Aug 2017 23:58:48 -0400 Subject: [PATCH] Expand World.spawnParticle API and add Builder @@ -10,7 +10,7 @@ This adds a new Builder API which is much friendlier to use. diff --git a/src/main/java/com/destroystokyo/paper/ParticleBuilder.java b/src/main/java/com/destroystokyo/paper/ParticleBuilder.java new file mode 100644 -index 00000000..06f1602f +index 000000000..06f1602f5 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/ParticleBuilder.java @@ -0,0 +1,478 @@ @@ -493,7 +493,7 @@ index 00000000..06f1602f + } +} diff --git a/src/main/java/org/bukkit/Particle.java b/src/main/java/org/bukkit/Particle.java -index 68cb7442..69aae30a 100644 +index 68cb74420..69aae30a3 100644 --- a/src/main/java/org/bukkit/Particle.java +++ b/src/main/java/org/bukkit/Particle.java @@ -92,6 +92,17 @@ public enum Particle { @@ -515,7 +515,7 @@ index 68cb7442..69aae30a 100644 * Options which can be applied to redstone dust particles - a particle * color and size. diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java -index e1e674ba..fbd61137 100644 +index e1e674bab..fbd61137d 100644 --- a/src/main/java/org/bukkit/World.java +++ b/src/main/java/org/bukkit/World.java @@ -2081,7 +2081,57 @@ public interface World extends PluginMessageRecipient, Metadatable { diff --git a/Spigot-API-Patches/0098-EndermanAttackPlayerEvent.patch b/Spigot-API-Patches/0098-EndermanAttackPlayerEvent.patch index 1808f165b8..2859ed6917 100644 --- a/Spigot-API-Patches/0098-EndermanAttackPlayerEvent.patch +++ b/Spigot-API-Patches/0098-EndermanAttackPlayerEvent.patch @@ -1,4 +1,4 @@ -From c773ef768d279a34cf0da370b4de5b0bf3347559 Mon Sep 17 00:00:00 2001 +From aa4f86bbc020f5306e1ada6682f1cd5038705d26 Mon Sep 17 00:00:00 2001 From: Aikar Date: Tue, 1 May 2018 20:17:44 -0400 Subject: [PATCH] EndermanAttackPlayerEvent @@ -9,7 +9,7 @@ This allows you to override/extend the pumpkin/stare logic. diff --git a/src/main/java/com/destroystokyo/paper/event/entity/EndermanAttackPlayerEvent.java b/src/main/java/com/destroystokyo/paper/event/entity/EndermanAttackPlayerEvent.java new file mode 100644 -index 00000000..f530a3d9 +index 000000000..f530a3d93 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/event/entity/EndermanAttackPlayerEvent.java @@ -0,0 +1,101 @@ 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 b33dc193fa..6d34021fb9 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 63f352493cf36bf80eb1d97a0ea3d897b5766bd3 Mon Sep 17 00:00:00 2001 +From 3e3830e4aa44ae11c4e290cb7c0dd890316155b9 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 @@ -7,7 +7,7 @@ This should close more memory leaks from /reload and disabling plugins, by closing the class loader and the jar file. diff --git a/src/main/java/org/bukkit/plugin/PluginLoader.java b/src/main/java/org/bukkit/plugin/PluginLoader.java -index a88733f1..6ab9cd82 100644 +index a88733f1c..6ab9cd821 100644 --- a/src/main/java/org/bukkit/plugin/PluginLoader.java +++ b/src/main/java/org/bukkit/plugin/PluginLoader.java @@ -77,4 +77,18 @@ public interface PluginLoader { @@ -30,7 +30,7 @@ index a88733f1..6ab9cd82 100644 + // Paper end - close Classloader on disable } diff --git a/src/main/java/org/bukkit/plugin/PluginManager.java b/src/main/java/org/bukkit/plugin/PluginManager.java -index 41e26451..86cc5025 100644 +index 41e26451f..86cc5025a 100644 --- a/src/main/java/org/bukkit/plugin/PluginManager.java +++ b/src/main/java/org/bukkit/plugin/PluginManager.java @@ -161,6 +161,18 @@ public interface PluginManager { @@ -53,7 +53,7 @@ index 41e26451..86cc5025 100644 * Gets a {@link Permission} from its fully qualified name * diff --git a/src/main/java/org/bukkit/plugin/SimplePluginManager.java b/src/main/java/org/bukkit/plugin/SimplePluginManager.java -index 4cbec1f1..da3cd63b 100644 +index 4cbec1f11..da3cd63ba 100644 --- a/src/main/java/org/bukkit/plugin/SimplePluginManager.java +++ b/src/main/java/org/bukkit/plugin/SimplePluginManager.java @@ -428,17 +428,28 @@ public final class SimplePluginManager implements PluginManager { @@ -97,7 +97,7 @@ index 4cbec1f1..da3cd63b 100644 lookupNames.clear(); HandlerList.unregisterAll(); diff --git a/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java b/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java -index 06b6724f..bc7bf6a3 100644 +index 06b6724fa..bc7bf6a35 100644 --- a/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java +++ b/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java @@ -332,7 +332,7 @@ public final class JavaPluginLoader implements PluginLoader { diff --git a/Spigot-API-Patches/0100-WitchConsumePotionEvent.patch b/Spigot-API-Patches/0100-WitchConsumePotionEvent.patch index 1465f0ad88..9fd11d94ba 100644 --- a/Spigot-API-Patches/0100-WitchConsumePotionEvent.patch +++ b/Spigot-API-Patches/0100-WitchConsumePotionEvent.patch @@ -1,4 +1,4 @@ -From e454efd84631216d67774e33cabd7cd2e823447f Mon Sep 17 00:00:00 2001 +From 63173a6e667fb9d210ce370b0dcdc3e7070409e9 Mon Sep 17 00:00:00 2001 From: Aikar Date: Wed, 16 May 2018 20:26:16 -0400 Subject: [PATCH] WitchConsumePotionEvent @@ -7,7 +7,7 @@ Fires when a witch consumes the potion in their hand diff --git a/src/main/java/com/destroystokyo/paper/event/entity/WitchConsumePotionEvent.java b/src/main/java/com/destroystokyo/paper/event/entity/WitchConsumePotionEvent.java new file mode 100644 -index 00000000..fbbace36 +index 000000000..fbbace36d --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/event/entity/WitchConsumePotionEvent.java @@ -0,0 +1,70 @@ @@ -83,7 +83,7 @@ index 00000000..fbbace36 +} diff --git a/src/main/java/com/destroystokyo/paper/event/entity/WitchThrowPotionEvent.java b/src/main/java/com/destroystokyo/paper/event/entity/WitchThrowPotionEvent.java new file mode 100644 -index 00000000..6ef6367b +index 000000000..6ef6367b6 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/event/entity/WitchThrowPotionEvent.java @@ -0,0 +1,33 @@ diff --git a/Spigot-API-Patches/0101-WitchThrowPotionEvent.patch b/Spigot-API-Patches/0101-WitchThrowPotionEvent.patch index 3e85db0fb4..89169e3969 100644 --- a/Spigot-API-Patches/0101-WitchThrowPotionEvent.patch +++ b/Spigot-API-Patches/0101-WitchThrowPotionEvent.patch @@ -1,4 +1,4 @@ -From 5183d6aa6a230ae1cad69fd2a54589f6b82dfee0 Mon Sep 17 00:00:00 2001 +From 370a4771fbdea9734fb5d56b1aa43126b469cc9e Mon Sep 17 00:00:00 2001 From: Aikar Date: Wed, 16 May 2018 20:39:09 -0400 Subject: [PATCH] WitchThrowPotionEvent @@ -6,7 +6,7 @@ Subject: [PATCH] WitchThrowPotionEvent Fired when a witch throws a potion at a player diff --git a/src/main/java/com/destroystokyo/paper/event/entity/WitchThrowPotionEvent.java b/src/main/java/com/destroystokyo/paper/event/entity/WitchThrowPotionEvent.java -index 6ef6367b..688a596a 100644 +index 6ef6367b6..688a596aa 100644 --- a/src/main/java/com/destroystokyo/paper/event/entity/WitchThrowPotionEvent.java +++ b/src/main/java/com/destroystokyo/paper/event/entity/WitchThrowPotionEvent.java @@ -1,29 +1,77 @@ diff --git a/Spigot-API-Patches/0102-Location.toBlockLocation-toCenterLocation.patch b/Spigot-API-Patches/0102-Location.toBlockLocation-toCenterLocation.patch index 9795f5ff97..8a429c6b98 100644 --- a/Spigot-API-Patches/0102-Location.toBlockLocation-toCenterLocation.patch +++ b/Spigot-API-Patches/0102-Location.toBlockLocation-toCenterLocation.patch @@ -1,4 +1,4 @@ -From bf76c03cf7730ea8d7f3ae692cb406f28326d9ef Mon Sep 17 00:00:00 2001 +From 0250a611d073217330818e22a7a9a10d66e0b942 Mon Sep 17 00:00:00 2001 From: Aikar Date: Thu, 24 May 2018 21:01:13 -0400 Subject: [PATCH] Location.toBlockLocation/toCenterLocation() @@ -6,7 +6,7 @@ Subject: [PATCH] Location.toBlockLocation/toCenterLocation() Convert location objects to their block coordinates, or the center of the block diff --git a/src/main/java/org/bukkit/Location.java b/src/main/java/org/bukkit/Location.java -index 6021e672..4f695faf 100644 +index 6021e6729..4f695faf4 100644 --- a/src/main/java/org/bukkit/Location.java +++ b/src/main/java/org/bukkit/Location.java @@ -534,6 +534,31 @@ public class Location implements Cloneable, ConfigurationSerializable { diff --git a/Spigot-API-Patches/0103-PotionEffect-clone-methods.patch b/Spigot-API-Patches/0103-PotionEffect-clone-methods.patch index e602df8490..b7227c8dba 100644 --- a/Spigot-API-Patches/0103-PotionEffect-clone-methods.patch +++ b/Spigot-API-Patches/0103-PotionEffect-clone-methods.patch @@ -1,11 +1,11 @@ -From c7a93ea87077c8180f4a4bdb6012b45c63a84543 Mon Sep 17 00:00:00 2001 +From e218ee0a11df0d3b800ad2a33c733331c8cf52e5 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sun, 3 Jun 2018 04:10:13 -0400 Subject: [PATCH] PotionEffect clone methods diff --git a/src/main/java/org/bukkit/potion/PotionEffect.java b/src/main/java/org/bukkit/potion/PotionEffect.java -index bbefcd58..0193e075 100644 +index bbefcd580..0193e0754 100644 --- a/src/main/java/org/bukkit/potion/PotionEffect.java +++ b/src/main/java/org/bukkit/potion/PotionEffect.java @@ -101,6 +101,33 @@ public class PotionEffect implements ConfigurationSerializable { diff --git a/Spigot-API-Patches/0104-WitchReadyPotionEvent.patch b/Spigot-API-Patches/0104-WitchReadyPotionEvent.patch index 91be8db816..3743d7846b 100644 --- a/Spigot-API-Patches/0104-WitchReadyPotionEvent.patch +++ b/Spigot-API-Patches/0104-WitchReadyPotionEvent.patch @@ -1,4 +1,4 @@ -From 63dc44f5af0bb4d788eee64733e6b673b4c96831 Mon Sep 17 00:00:00 2001 +From e289e5508f6251c6e1c236bf739c7b096af8ac78 Mon Sep 17 00:00:00 2001 From: Aikar Date: Tue, 5 Jun 2018 22:47:08 -0400 Subject: [PATCH] WitchReadyPotionEvent @@ -7,7 +7,7 @@ Control what potion the witch readies to use diff --git a/src/main/java/com/destroystokyo/paper/event/entity/WitchReadyPotionEvent.java b/src/main/java/com/destroystokyo/paper/event/entity/WitchReadyPotionEvent.java new file mode 100644 -index 00000000..5351b523 +index 000000000..5351b523d --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/event/entity/WitchReadyPotionEvent.java @@ -0,0 +1,80 @@ diff --git a/Spigot-API-Patches/0105-ItemStack-getMaxItemUseDuration.patch b/Spigot-API-Patches/0105-ItemStack-getMaxItemUseDuration.patch index c4028224d6..04dea01fd2 100644 --- a/Spigot-API-Patches/0105-ItemStack-getMaxItemUseDuration.patch +++ b/Spigot-API-Patches/0105-ItemStack-getMaxItemUseDuration.patch @@ -1,4 +1,4 @@ -From 4ff82e5af876626b15bd1e45fedb42381fc7c7a3 Mon Sep 17 00:00:00 2001 +From 692de5e0b9e17b3c6acebb2dc95cfd8c840cc7bc Mon Sep 17 00:00:00 2001 From: Aikar Date: Tue, 5 Jun 2018 22:59:50 -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/org/bukkit/inventory/ItemStack.java b/src/main/java/org/bukkit/inventory/ItemStack.java -index 9526cfe0..f129121e 100644 +index 9526cfe02..f129121e5 100644 --- a/src/main/java/org/bukkit/inventory/ItemStack.java +++ b/src/main/java/org/bukkit/inventory/ItemStack.java @@ -603,5 +603,13 @@ public class ItemStack implements Cloneable, ConfigurationSerializable { diff --git a/Spigot-API-Patches/0106-Add-EntityTeleportEndGatewayEvent.patch b/Spigot-API-Patches/0106-Add-EntityTeleportEndGatewayEvent.patch index 352ddd4144..f07ede74d1 100644 --- a/Spigot-API-Patches/0106-Add-EntityTeleportEndGatewayEvent.patch +++ b/Spigot-API-Patches/0106-Add-EntityTeleportEndGatewayEvent.patch @@ -1,4 +1,4 @@ -From 9c461d8d344b0176143af283f8385f567bcc3c2d Mon Sep 17 00:00:00 2001 +From a1946536e0c117fecbe34d8f15c4a2f48a70cb86 Mon Sep 17 00:00:00 2001 From: Shane Freeder Date: Sat, 9 Jun 2018 13:08:21 +0100 Subject: [PATCH] Add EntityTeleportEndGatewayEvent @@ -6,7 +6,7 @@ Subject: [PATCH] Add EntityTeleportEndGatewayEvent diff --git a/src/main/java/com/destroystokyo/paper/event/entity/EntityTeleportEndGatewayEvent.java b/src/main/java/com/destroystokyo/paper/event/entity/EntityTeleportEndGatewayEvent.java new file mode 100644 -index 00000000..bfc69a43 +index 000000000..bfc69a43c --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/event/entity/EntityTeleportEndGatewayEvent.java @@ -0,0 +1,31 @@ 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 fd01fece36..1ee3fc1428 100644 --- a/Spigot-API-Patches/0107-Make-shield-blocking-delay-configurable.patch +++ b/Spigot-API-Patches/0107-Make-shield-blocking-delay-configurable.patch @@ -1,11 +1,11 @@ -From 8ed3dc7a4e8ac87e1972ef34e9b3896603fb69d4 Mon Sep 17 00:00:00 2001 +From f77aa11967b3f1cb9daf228fdeb7942dd128585b Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Sat, 16 Jun 2018 01:17:39 -0500 Subject: [PATCH] Make shield blocking delay configurable diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java -index ffbf3d7a..e08dfe17 100644 +index ffbf3d7a8..e08dfe17f 100644 --- a/src/main/java/org/bukkit/entity/LivingEntity.java +++ b/src/main/java/org/bukkit/entity/LivingEntity.java @@ -523,5 +523,19 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource 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 ab75d237c4..73a0488b60 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 8cff2d98b5379af84aeab9de2dcc13e26d470c03 Mon Sep 17 00:00:00 2001 +From 43cb4f347979fa70a0374d85f070f6e69f9230e1 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sat, 15 Jun 2013 19:52:04 -0400 Subject: [PATCH] EntityShootBowEvent consumeArrow and getArrowItem API @@ -6,7 +6,7 @@ Subject: [PATCH] EntityShootBowEvent consumeArrow and getArrowItem API Adds ability to get what arrow was shot, and control if it should be consumed. diff --git a/src/main/java/org/bukkit/event/entity/EntityShootBowEvent.java b/src/main/java/org/bukkit/event/entity/EntityShootBowEvent.java -index 18c5e31a..37dbc12e 100644 +index 18c5e31ab..37dbc12eb 100644 --- a/src/main/java/org/bukkit/event/entity/EntityShootBowEvent.java +++ b/src/main/java/org/bukkit/event/entity/EntityShootBowEvent.java @@ -2,6 +2,7 @@ package org.bukkit.event.entity; 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 a4b71979ff..a830a5281b 100644 --- a/Spigot-API-Patches/0109-Add-getNearbyXXX-methods-to-Location.patch +++ b/Spigot-API-Patches/0109-Add-getNearbyXXX-methods-to-Location.patch @@ -1,11 +1,11 @@ -From cd1e5704bdbbc91bb3458ad84aebdb285c6aa1c0 Mon Sep 17 00:00:00 2001 +From 764c512e9c00a527de28f28dadb58180059db507 Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Mon, 18 Jun 2018 00:41:46 -0500 Subject: [PATCH] Add "getNearbyXXX" methods to Location diff --git a/src/main/java/org/bukkit/Location.java b/src/main/java/org/bukkit/Location.java -index 4f695faf..5730d5f4 100644 +index 4f695faf4..5730d5f46 100644 --- a/src/main/java/org/bukkit/Location.java +++ b/src/main/java/org/bukkit/Location.java @@ -12,6 +12,15 @@ import org.bukkit.util.Vector; diff --git a/Spigot-API-Patches/0110-PlayerReadyArrowEvent.patch b/Spigot-API-Patches/0110-PlayerReadyArrowEvent.patch index b7755a614b..d467376769 100644 --- a/Spigot-API-Patches/0110-PlayerReadyArrowEvent.patch +++ b/Spigot-API-Patches/0110-PlayerReadyArrowEvent.patch @@ -1,4 +1,4 @@ -From 2579ae2f66e730b085f10c3228d6140ad01430ba Mon Sep 17 00:00:00 2001 +From eebac763782db82430da645d0966d56d2a2e2c68 Mon Sep 17 00:00:00 2001 From: Aikar Date: Mon, 18 Jun 2018 01:09:27 -0400 Subject: [PATCH] PlayerReadyArrowEvent @@ -8,7 +8,7 @@ Plugins can skip selection of certain arrows and control which is used. diff --git a/src/main/java/com/destroystokyo/paper/event/player/PlayerReadyArrowEvent.java b/src/main/java/com/destroystokyo/paper/event/player/PlayerReadyArrowEvent.java new file mode 100644 -index 00000000..5d04a22f +index 000000000..5d04a22fd --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/event/player/PlayerReadyArrowEvent.java @@ -0,0 +1,93 @@ diff --git a/Spigot-API-Patches/0111-Add-EntityKnockbackByEntityEvent.patch b/Spigot-API-Patches/0111-Add-EntityKnockbackByEntityEvent.patch index 7a0a1012ad..a8a7c42849 100644 --- a/Spigot-API-Patches/0111-Add-EntityKnockbackByEntityEvent.patch +++ b/Spigot-API-Patches/0111-Add-EntityKnockbackByEntityEvent.patch @@ -1,4 +1,4 @@ -From 0df61b65f48c93c8581c3a9e512e67ceaed88194 Mon Sep 17 00:00:00 2001 +From 4e5ba98b2346d1fd3b9b1a5d83209f9a3f7ff399 Mon Sep 17 00:00:00 2001 From: Brokkonaut Date: Mon, 18 Jun 2018 15:40:39 +0200 Subject: [PATCH] Add EntityKnockbackByEntityEvent @@ -6,7 +6,7 @@ Subject: [PATCH] Add EntityKnockbackByEntityEvent diff --git a/src/main/java/com/destroystokyo/paper/event/entity/EntityKnockbackByEntityEvent.java b/src/main/java/com/destroystokyo/paper/event/entity/EntityKnockbackByEntityEvent.java new file mode 100644 -index 00000000..9efecaba +index 000000000..9efecabab --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/event/entity/EntityKnockbackByEntityEvent.java @@ -0,0 +1,82 @@ diff --git a/Spigot-API-Patches/0112-Expand-Explosions-API.patch b/Spigot-API-Patches/0112-Expand-Explosions-API.patch index e255c46db4..db327bf64b 100644 --- a/Spigot-API-Patches/0112-Expand-Explosions-API.patch +++ b/Spigot-API-Patches/0112-Expand-Explosions-API.patch @@ -1,4 +1,4 @@ -From 18333843870e8b62ec99eb21aa3afb70b122d033 Mon Sep 17 00:00:00 2001 +From ba148b90852ef7564fd6d02bee360ae9fef0cfdc Mon Sep 17 00:00:00 2001 From: Aikar Date: Tue, 19 Dec 2017 16:24:42 -0500 Subject: [PATCH] Expand Explosions API @@ -6,7 +6,7 @@ Subject: [PATCH] Expand Explosions API Add Entity as a Source capability, and add more API choices, and on Location. diff --git a/src/main/java/org/bukkit/Location.java b/src/main/java/org/bukkit/Location.java -index 5730d5f4..b226d7e4 100644 +index 5730d5f46..b226d7e4c 100644 --- a/src/main/java/org/bukkit/Location.java +++ b/src/main/java/org/bukkit/Location.java @@ -7,6 +7,7 @@ import java.util.HashMap; @@ -106,7 +106,7 @@ index 5730d5f4..b226d7e4 100644 * Returns a list of entities within a bounding box centered around a Location. * diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java -index fbd61137..8f69dced 100644 +index fbd61137d..8f69dced1 100644 --- a/src/main/java/org/bukkit/World.java +++ b/src/main/java/org/bukkit/World.java @@ -1201,6 +1201,102 @@ public interface World extends PluginMessageRecipient, Metadatable { 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 3fb56c30d1..7d345eec82 100644 --- a/Spigot-API-Patches/0113-ItemStack-API-additions-for-quantity-flags-lore.patch +++ b/Spigot-API-Patches/0113-ItemStack-API-additions-for-quantity-flags-lore.patch @@ -1,11 +1,11 @@ -From f18032a0ddc6bf008b5420f6dc30f06490a7e266 Mon Sep 17 00:00:00 2001 +From dfd8fca6ce67e081ff3d65b09dea005d41b30d11 Mon Sep 17 00:00:00 2001 From: Aikar Date: Fri, 22 Jun 2018 22:59:18 -0400 Subject: [PATCH] ItemStack API additions for quantity/flags/lore diff --git a/src/main/java/org/bukkit/inventory/ItemStack.java b/src/main/java/org/bukkit/inventory/ItemStack.java -index f129121e..690abbba 100644 +index f129121e5..690abbba2 100644 --- a/src/main/java/org/bukkit/inventory/ItemStack.java +++ b/src/main/java/org/bukkit/inventory/ItemStack.java @@ -2,7 +2,9 @@ package org.bukkit.inventory; 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 d7559a1796..672f38bf84 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 c13c50f8c81e38a98d62384277eb84e3ca9a5f44 Mon Sep 17 00:00:00 2001 +From c010112cddd5f278c0a3eb5d761482c589478d15 Mon Sep 17 00:00:00 2001 From: Aikar Date: Fri, 29 Jun 2018 00:19:19 -0400 Subject: [PATCH] LivingEntity Hand Raised/Item Use API @@ -6,7 +6,7 @@ Subject: [PATCH] LivingEntity Hand Raised/Item Use API How long an entity has raised hands to charge an attack or use an item diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java -index e08dfe17..6e3284b2 100644 +index e08dfe17f..6e3284b20 100644 --- a/src/main/java/org/bukkit/entity/LivingEntity.java +++ b/src/main/java/org/bukkit/entity/LivingEntity.java @@ -11,6 +11,7 @@ import org.bukkit.attribute.Attributable; diff --git a/Spigot-API-Patches/0115-RangedEntity-API.patch b/Spigot-API-Patches/0115-RangedEntity-API.patch index efc449317c..08f74f198b 100644 --- a/Spigot-API-Patches/0115-RangedEntity-API.patch +++ b/Spigot-API-Patches/0115-RangedEntity-API.patch @@ -1,4 +1,4 @@ -From 191d54c0de07b2d996bd755ec0c2cbdbdd52d6ee Mon Sep 17 00:00:00 2001 +From 7206d870310a8b84412b61d2edd71fc0ef5a863a Mon Sep 17 00:00:00 2001 From: Aikar Date: Tue, 26 Jun 2018 21:34:40 -0400 Subject: [PATCH] RangedEntity API @@ -8,7 +8,7 @@ and to perform an attack. diff --git a/src/main/java/com/destroystokyo/paper/entity/RangedEntity.java b/src/main/java/com/destroystokyo/paper/entity/RangedEntity.java new file mode 100644 -index 00000000..f2e3233a +index 000000000..f2e3233a3 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/entity/RangedEntity.java @@ -0,0 +1,31 @@ @@ -44,7 +44,7 @@ index 00000000..f2e3233a + } +} diff --git a/src/main/java/org/bukkit/entity/Illusioner.java b/src/main/java/org/bukkit/entity/Illusioner.java -index 7c92c431..14e6c5ee 100644 +index 7c92c431b..14e6c5ee0 100644 --- a/src/main/java/org/bukkit/entity/Illusioner.java +++ b/src/main/java/org/bukkit/entity/Illusioner.java @@ -1,6 +1,10 @@ @@ -60,7 +60,7 @@ index 7c92c431..14e6c5ee 100644 + +} diff --git a/src/main/java/org/bukkit/entity/Llama.java b/src/main/java/org/bukkit/entity/Llama.java -index c4385429..d23226cc 100644 +index c43854298..d23226ccb 100644 --- a/src/main/java/org/bukkit/entity/Llama.java +++ b/src/main/java/org/bukkit/entity/Llama.java @@ -1,12 +1,13 @@ @@ -79,7 +79,7 @@ index c4385429..d23226cc 100644 /** * Represents the base color that the llama has. diff --git a/src/main/java/org/bukkit/entity/Skeleton.java b/src/main/java/org/bukkit/entity/Skeleton.java -index 16b12938..1c367f78 100644 +index 16b129388..1c367f78e 100644 --- a/src/main/java/org/bukkit/entity/Skeleton.java +++ b/src/main/java/org/bukkit/entity/Skeleton.java @@ -2,11 +2,12 @@ package org.bukkit.entity; @@ -97,7 +97,7 @@ index 16b12938..1c367f78 100644 /** * Gets the current type of this skeleton. diff --git a/src/main/java/org/bukkit/entity/Snowman.java b/src/main/java/org/bukkit/entity/Snowman.java -index 818efe2a..10f8f6d4 100644 +index 818efe2a4..10f8f6d45 100644 --- a/src/main/java/org/bukkit/entity/Snowman.java +++ b/src/main/java/org/bukkit/entity/Snowman.java @@ -1,9 +1,11 @@ @@ -114,7 +114,7 @@ index 818efe2a..10f8f6d4 100644 /** * Gets whether this snowman is in "derp mode", meaning it is not wearing a diff --git a/src/main/java/org/bukkit/entity/Witch.java b/src/main/java/org/bukkit/entity/Witch.java -index b4343903..aa88aede 100644 +index b4343903b..aa88aede6 100644 --- a/src/main/java/org/bukkit/entity/Witch.java +++ b/src/main/java/org/bukkit/entity/Witch.java @@ -1,7 +1,9 @@ @@ -129,7 +129,7 @@ index b4343903..aa88aede 100644 +public interface Witch extends Raider, RangedEntity { // Paper } diff --git a/src/main/java/org/bukkit/entity/Wither.java b/src/main/java/org/bukkit/entity/Wither.java -index 3bc332ee..426d3693 100644 +index 3bc332ee7..426d36933 100644 --- a/src/main/java/org/bukkit/entity/Wither.java +++ b/src/main/java/org/bukkit/entity/Wither.java @@ -1,7 +1,9 @@ @@ -144,7 +144,7 @@ index 3bc332ee..426d3693 100644 +public interface Wither extends Monster, Boss, RangedEntity { // Paper } diff --git a/src/main/java/org/bukkit/inventory/ItemStack.java b/src/main/java/org/bukkit/inventory/ItemStack.java -index 690abbba..6d18de76 100644 +index 690abbba2..6d18de762 100644 --- a/src/main/java/org/bukkit/inventory/ItemStack.java +++ b/src/main/java/org/bukkit/inventory/ItemStack.java @@ -18,7 +18,7 @@ import org.jetbrains.annotations.NotNull; 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 7962f6de68..70a365e44b 100644 --- a/Spigot-API-Patches/0116-Add-World.getEntity-UUID-API.patch +++ b/Spigot-API-Patches/0116-Add-World.getEntity-UUID-API.patch @@ -1,11 +1,11 @@ -From 30e95a4cbd997640b4ad3b63ae46e8b8caf15161 Mon Sep 17 00:00:00 2001 +From 12ff230974f3889a5913e6fd131cc5a1ff2bcdbc Mon Sep 17 00:00:00 2001 From: Brokkonaut Date: Tue, 3 Jul 2018 16:07:16 +0200 Subject: [PATCH] Add World.getEntity(UUID) API diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java -index 8f69dced..0b328315 100644 +index 8f69dced1..0b3283153 100644 --- a/src/main/java/org/bukkit/World.java +++ b/src/main/java/org/bukkit/World.java @@ -776,6 +776,17 @@ public interface World extends PluginMessageRecipient, Metadatable { diff --git a/Spigot-API-Patches/0117-InventoryCloseEvent-Reason-API.patch b/Spigot-API-Patches/0117-InventoryCloseEvent-Reason-API.patch index 8f1e4d65be..f2e92f3c1c 100644 --- a/Spigot-API-Patches/0117-InventoryCloseEvent-Reason-API.patch +++ b/Spigot-API-Patches/0117-InventoryCloseEvent-Reason-API.patch @@ -1,4 +1,4 @@ -From da54191d0c80dea58ca857a395d3a39ccfdcc585 Mon Sep 17 00:00:00 2001 +From eb5564199182f44fc78cafb7c7436808d8a3905f 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 cdbac95b..f25c7315 100644 +index cdbac95bb..f25c73155 100644 --- a/src/main/java/org/bukkit/entity/HumanEntity.java +++ b/src/main/java/org/bukkit/entity/HumanEntity.java @@ -152,6 +152,15 @@ public interface HumanEntity extends LivingEntity, AnimalTamer, InventoryHolder @@ -27,7 +27,7 @@ index cdbac95b..f25c7315 100644 * Returns the ItemStack currently in your hand, can be empty. * diff --git a/src/main/java/org/bukkit/event/inventory/InventoryCloseEvent.java b/src/main/java/org/bukkit/event/inventory/InventoryCloseEvent.java -index 5861247c..21ad8888 100644 +index 5861247c1..21ad8888c 100644 --- a/src/main/java/org/bukkit/event/inventory/InventoryCloseEvent.java +++ b/src/main/java/org/bukkit/event/inventory/InventoryCloseEvent.java @@ -11,9 +11,60 @@ import org.jetbrains.annotations.NotNull; diff --git a/Spigot-API-Patches/0118-Entity-getChunk-API.patch b/Spigot-API-Patches/0118-Entity-getChunk-API.patch index 400e1df779..1735c550bd 100644 --- a/Spigot-API-Patches/0118-Entity-getChunk-API.patch +++ b/Spigot-API-Patches/0118-Entity-getChunk-API.patch @@ -1,4 +1,4 @@ -From 510847f2f98f230e51cd206db7175a8b07f15b67 Mon Sep 17 00:00:00 2001 +From d6bcd29ce4d32cec5681f218fb2f357da158f4ce Mon Sep 17 00:00:00 2001 From: Aikar Date: Wed, 4 Jul 2018 02:25:48 -0400 Subject: [PATCH] Entity#getChunk API @@ -6,7 +6,7 @@ Subject: [PATCH] Entity#getChunk API Get the chunk the entity is currently registered to diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java -index 35d0909b..adca48f1 100644 +index 35d0909b1..adca48f18 100644 --- a/src/main/java/org/bukkit/entity/Entity.java +++ b/src/main/java/org/bukkit/entity/Entity.java @@ -3,6 +3,7 @@ package org.bukkit.entity; 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 7006987a52..e7df712c41 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 c3a4f448b987e671941688fde2af3d1154b9823c Mon Sep 17 00:00:00 2001 +From 46a1dec89a72bc0b523d5f34a958170aacd7d0eb Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Thu, 19 Jul 2018 15:07:02 -0500 Subject: [PATCH] Add an asterisk to legacy API plugins @@ -7,7 +7,7 @@ Not here to name and shame, only so server admins can be aware of which plugins have and haven't been updated. diff --git a/src/main/java/org/bukkit/UnsafeValues.java b/src/main/java/org/bukkit/UnsafeValues.java -index c0ff133d..b173e2ec 100644 +index c0ff133de..b173e2ece 100644 --- a/src/main/java/org/bukkit/UnsafeValues.java +++ b/src/main/java/org/bukkit/UnsafeValues.java @@ -83,5 +83,9 @@ public interface UnsafeValues { @@ -21,7 +21,7 @@ index c0ff133d..b173e2ec 100644 // Paper end } diff --git a/src/main/java/org/bukkit/command/defaults/PluginsCommand.java b/src/main/java/org/bukkit/command/defaults/PluginsCommand.java -index d4e74d29..6cfd9f3c 100644 +index d4e74d292..6cfd9f3c6 100644 --- a/src/main/java/org/bukkit/command/defaults/PluginsCommand.java +++ b/src/main/java/org/bukkit/command/defaults/PluginsCommand.java @@ -41,7 +41,14 @@ public class PluginsCommand extends BukkitCommand { @@ -41,7 +41,7 @@ index d4e74d29..6cfd9f3c 100644 StringBuilder pluginList = new StringBuilder(); diff --git a/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java b/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java -index bc7bf6a3..31a70b29 100644 +index bc7bf6a35..31a70b294 100644 --- a/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java +++ b/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java @@ -316,7 +316,14 @@ public final class JavaPluginLoader implements PluginLoader { diff --git a/Spigot-API-Patches/0120-EnderDragon-Events.patch b/Spigot-API-Patches/0120-EnderDragon-Events.patch index d1ed538e13..d00629fc58 100644 --- a/Spigot-API-Patches/0120-EnderDragon-Events.patch +++ b/Spigot-API-Patches/0120-EnderDragon-Events.patch @@ -1,4 +1,4 @@ -From c3dcb41ecc3c27a968a757ea4dda9a9d35c7661f Mon Sep 17 00:00:00 2001 +From 7a2f8cd3f8479d83a9b7d3cd6dbb8e7cfdbb5b86 Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Sat, 21 Jul 2018 01:51:05 -0500 Subject: [PATCH] EnderDragon Events @@ -6,7 +6,7 @@ Subject: [PATCH] EnderDragon Events diff --git a/src/main/java/com/destroystokyo/paper/event/entity/EnderDragonFireballHitEvent.java b/src/main/java/com/destroystokyo/paper/event/entity/EnderDragonFireballHitEvent.java new file mode 100644 -index 00000000..118c7b67 +index 000000000..118c7b677 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/event/entity/EnderDragonFireballHitEvent.java @@ -0,0 +1,79 @@ @@ -91,7 +91,7 @@ index 00000000..118c7b67 +} diff --git a/src/main/java/com/destroystokyo/paper/event/entity/EnderDragonFlameEvent.java b/src/main/java/com/destroystokyo/paper/event/entity/EnderDragonFlameEvent.java new file mode 100644 -index 00000000..1915177f +index 000000000..1915177f4 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/event/entity/EnderDragonFlameEvent.java @@ -0,0 +1,61 @@ @@ -158,7 +158,7 @@ index 00000000..1915177f +} diff --git a/src/main/java/com/destroystokyo/paper/event/entity/EnderDragonShootFireballEvent.java b/src/main/java/com/destroystokyo/paper/event/entity/EnderDragonShootFireballEvent.java new file mode 100644 -index 00000000..8414bd80 +index 000000000..8414bd805 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/event/entity/EnderDragonShootFireballEvent.java @@ -0,0 +1,61 @@ diff --git a/Spigot-API-Patches/0121-PlayerLaunchProjectileEvent.patch b/Spigot-API-Patches/0121-PlayerLaunchProjectileEvent.patch index 51344b3b2d..b7a06f08e1 100644 --- a/Spigot-API-Patches/0121-PlayerLaunchProjectileEvent.patch +++ b/Spigot-API-Patches/0121-PlayerLaunchProjectileEvent.patch @@ -1,4 +1,4 @@ -From fe1133cb18af58ae0b15203109297df3b233ed5d Mon Sep 17 00:00:00 2001 +From 5b1d6469dfc8f3de23dc68e1ec17b72037de793c Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Sat, 21 Jul 2018 03:10:50 -0500 Subject: [PATCH] PlayerLaunchProjectileEvent @@ -6,7 +6,7 @@ Subject: [PATCH] PlayerLaunchProjectileEvent diff --git a/src/main/java/com/destroystokyo/paper/event/player/PlayerLaunchProjectileEvent.java b/src/main/java/com/destroystokyo/paper/event/player/PlayerLaunchProjectileEvent.java new file mode 100644 -index 00000000..9074b2ed +index 000000000..9074b2ede --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/event/player/PlayerLaunchProjectileEvent.java @@ -0,0 +1,83 @@ diff --git a/Spigot-API-Patches/0122-PlayerElytraBoostEvent.patch b/Spigot-API-Patches/0122-PlayerElytraBoostEvent.patch index 94f0ef13e4..580518440d 100644 --- a/Spigot-API-Patches/0122-PlayerElytraBoostEvent.patch +++ b/Spigot-API-Patches/0122-PlayerElytraBoostEvent.patch @@ -1,4 +1,4 @@ -From 210779762b6b255f3c0957958051f6d710eb88fc Mon Sep 17 00:00:00 2001 +From 86c181f87ca0644622e3ee055e7ed5a1ba8ad4d7 Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Sat, 21 Jul 2018 01:59:53 -0500 Subject: [PATCH] PlayerElytraBoostEvent @@ -6,7 +6,7 @@ Subject: [PATCH] PlayerElytraBoostEvent diff --git a/src/main/java/com/destroystokyo/paper/event/player/PlayerElytraBoostEvent.java b/src/main/java/com/destroystokyo/paper/event/player/PlayerElytraBoostEvent.java new file mode 100644 -index 00000000..e9a76a25 +index 000000000..e9a76a25f --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/event/player/PlayerElytraBoostEvent.java @@ -0,0 +1,85 @@ diff --git a/Spigot-API-Patches/0123-EntityTransformedEvent.patch b/Spigot-API-Patches/0123-EntityTransformedEvent.patch index d1084f9c2b..4acc75c568 100644 --- a/Spigot-API-Patches/0123-EntityTransformedEvent.patch +++ b/Spigot-API-Patches/0123-EntityTransformedEvent.patch @@ -1,4 +1,4 @@ -From 213b2c432b14f24689483abbf50f6c3716db4584 Mon Sep 17 00:00:00 2001 +From 56d375d75fb1a8f86decaa177f706f30b934489e Mon Sep 17 00:00:00 2001 From: Anthony MacAllister Date: Thu, 26 Jul 2018 15:28:53 -0400 Subject: [PATCH] EntityTransformedEvent @@ -6,7 +6,7 @@ Subject: [PATCH] EntityTransformedEvent diff --git a/src/main/java/com/destroystokyo/paper/event/entity/EntityTransformedEvent.java b/src/main/java/com/destroystokyo/paper/event/entity/EntityTransformedEvent.java new file mode 100644 -index 00000000..12194f1f +index 000000000..12194f1fc --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/event/entity/EntityTransformedEvent.java @@ -0,0 +1,92 @@ 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 f63dbcc1cd..60b53f1a24 100644 --- a/Spigot-API-Patches/0124-Allow-disabling-armour-stand-ticking.patch +++ b/Spigot-API-Patches/0124-Allow-disabling-armour-stand-ticking.patch @@ -1,11 +1,11 @@ -From 88132835dadea5f2e73892af9a3985379236fbe7 Mon Sep 17 00:00:00 2001 +From 9a13222d567970496d3ab6c9cbbe54ee6878b1d3 Mon Sep 17 00:00:00 2001 From: kashike Date: Wed, 15 Aug 2018 01:26:03 -0700 Subject: [PATCH] Allow disabling armour stand ticking diff --git a/src/main/java/org/bukkit/entity/ArmorStand.java b/src/main/java/org/bukkit/entity/ArmorStand.java -index 387d04e5..492df420 100644 +index 387d04e5b..492df420b 100644 --- a/src/main/java/org/bukkit/entity/ArmorStand.java +++ b/src/main/java/org/bukkit/entity/ArmorStand.java @@ -288,5 +288,21 @@ public interface ArmorStand extends LivingEntity { diff --git a/Spigot-API-Patches/0125-SkeletonHorse-Additions.patch b/Spigot-API-Patches/0125-SkeletonHorse-Additions.patch index 8075eab224..e9c83d0c8e 100644 --- a/Spigot-API-Patches/0125-SkeletonHorse-Additions.patch +++ b/Spigot-API-Patches/0125-SkeletonHorse-Additions.patch @@ -1,4 +1,4 @@ -From 2afe98b5368ce6cb6dd2099aef2f44e685a7c100 Mon Sep 17 00:00:00 2001 +From 7df5fd532b9ece9f1ba91a1a6d7f5872f5d1c1a7 Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Fri, 27 Jul 2018 22:36:17 -0500 Subject: [PATCH] SkeletonHorse Additions @@ -6,7 +6,7 @@ Subject: [PATCH] SkeletonHorse Additions diff --git a/src/main/java/com/destroystokyo/paper/event/entity/SkeletonHorseTrapEvent.java b/src/main/java/com/destroystokyo/paper/event/entity/SkeletonHorseTrapEvent.java new file mode 100644 -index 00000000..d79dbcd6 +index 000000000..d79dbcd68 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/event/entity/SkeletonHorseTrapEvent.java @@ -0,0 +1,47 @@ @@ -58,7 +58,7 @@ index 00000000..d79dbcd6 +} + diff --git a/src/main/java/org/bukkit/entity/SkeletonHorse.java b/src/main/java/org/bukkit/entity/SkeletonHorse.java -index b2c6b6a8..ba998346 100644 +index b2c6b6a86..ba9983463 100644 --- a/src/main/java/org/bukkit/entity/SkeletonHorse.java +++ b/src/main/java/org/bukkit/entity/SkeletonHorse.java @@ -3,4 +3,12 @@ package org.bukkit.entity; diff --git a/Spigot-API-Patches/0126-Expand-Location-Manipulation-API.patch b/Spigot-API-Patches/0126-Expand-Location-Manipulation-API.patch index b89de29345..5ea9b06e74 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 2fd4158a4def36728c68bb14c875f8375008ad38 Mon Sep 17 00:00:00 2001 +From f07eabbd911ba459af2dacc1ab4294304a9316fe Mon Sep 17 00:00:00 2001 From: Aikar Date: Wed, 25 Jul 2018 01:36:07 -0400 Subject: [PATCH] Expand Location Manipulation API @@ -6,7 +6,7 @@ Subject: [PATCH] Expand Location Manipulation API Adds set(x, y, z), add(base, x, y, z), subtract(base, x, y, z); diff --git a/src/main/java/org/bukkit/Location.java b/src/main/java/org/bukkit/Location.java -index b226d7e4..884862ab 100644 +index b226d7e4c..884862ab7 100644 --- a/src/main/java/org/bukkit/Location.java +++ b/src/main/java/org/bukkit/Location.java @@ -546,6 +546,54 @@ public class Location implements Cloneable, ConfigurationSerializable { diff --git a/Spigot-API-Patches/0127-Expand-ArmorStand-API.patch b/Spigot-API-Patches/0127-Expand-ArmorStand-API.patch index c04982c1ec..78eb3ddb99 100644 --- a/Spigot-API-Patches/0127-Expand-ArmorStand-API.patch +++ b/Spigot-API-Patches/0127-Expand-ArmorStand-API.patch @@ -1,4 +1,4 @@ -From ef423f6023541baa719a802f18754ca605e1aaaf Mon Sep 17 00:00:00 2001 +From 2f801a9a548c67f767e7c2a5ee8f98d3922670bf Mon Sep 17 00:00:00 2001 From: willies952002 Date: Thu, 26 Jul 2018 02:22:44 -0400 Subject: [PATCH] Expand ArmorStand API @@ -8,7 +8,7 @@ Add the following: - Enable/Disable slot interactions diff --git a/src/main/java/org/bukkit/entity/ArmorStand.java b/src/main/java/org/bukkit/entity/ArmorStand.java -index 492df420..e7f71e65 100644 +index 492df420b..e7f71e65e 100644 --- a/src/main/java/org/bukkit/entity/ArmorStand.java +++ b/src/main/java/org/bukkit/entity/ArmorStand.java @@ -1,5 +1,6 @@ diff --git a/Spigot-API-Patches/0128-AnvilDamageEvent.patch b/Spigot-API-Patches/0128-AnvilDamageEvent.patch index 175a483f5d..c0909619d1 100644 --- a/Spigot-API-Patches/0128-AnvilDamageEvent.patch +++ b/Spigot-API-Patches/0128-AnvilDamageEvent.patch @@ -1,4 +1,4 @@ -From c0d26c6ba4c12481f34150f71e8602c8a4fadfb5 Mon Sep 17 00:00:00 2001 +From 3b7e5e2acd739c7b0d7ac2debb2f87e52552932e Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Fri, 20 Jul 2018 23:36:55 -0500 Subject: [PATCH] AnvilDamageEvent @@ -6,7 +6,7 @@ Subject: [PATCH] AnvilDamageEvent diff --git a/src/main/java/com/destroystokyo/paper/event/block/AnvilDamagedEvent.java b/src/main/java/com/destroystokyo/paper/event/block/AnvilDamagedEvent.java new file mode 100644 -index 00000000..a83c286c +index 000000000..a83c286c1 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/event/block/AnvilDamagedEvent.java @@ -0,0 +1,148 @@ 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 cddf7e9884..70b7d3698b 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 9336ffd4a2dd66cca922c7bd5aeb6620ec41a347 Mon Sep 17 00:00:00 2001 +From 8a1c2f04b4e8b2ff55905824bb46080729c6c32b 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 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 bdbbde8627..1dcaa2dd99 100644 --- a/Spigot-API-Patches/0130-Add-hand-to-bucket-events.patch +++ b/Spigot-API-Patches/0130-Add-hand-to-bucket-events.patch @@ -1,11 +1,11 @@ -From b22b8ad9f32691a305d1ef4fd1d1ab8bdab72e1f Mon Sep 17 00:00:00 2001 +From 7289028e35c34417342840a7d8bc49228fc2d6c3 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 diff --git a/src/main/java/org/bukkit/event/player/PlayerBucketEmptyEvent.java b/src/main/java/org/bukkit/event/player/PlayerBucketEmptyEvent.java -index cdf2e201..5e93f1bb 100644 +index cdf2e2016..5e93f1bbb 100644 --- a/src/main/java/org/bukkit/event/player/PlayerBucketEmptyEvent.java +++ b/src/main/java/org/bukkit/event/player/PlayerBucketEmptyEvent.java @@ -5,6 +5,7 @@ import org.bukkit.block.Block; @@ -30,7 +30,7 @@ index cdf2e201..5e93f1bb 100644 @Override public HandlerList getHandlers() { diff --git a/src/main/java/org/bukkit/event/player/PlayerBucketEvent.java b/src/main/java/org/bukkit/event/player/PlayerBucketEvent.java -index d2990a20..dfc76add 100644 +index d2990a20d..dfc76add1 100644 --- a/src/main/java/org/bukkit/event/player/PlayerBucketEvent.java +++ b/src/main/java/org/bukkit/event/player/PlayerBucketEvent.java @@ -5,6 +5,7 @@ import org.bukkit.block.Block; @@ -83,7 +83,7 @@ index d2990a20..dfc76add 100644 public boolean isCancelled() { return cancelled; diff --git a/src/main/java/org/bukkit/event/player/PlayerBucketFillEvent.java b/src/main/java/org/bukkit/event/player/PlayerBucketFillEvent.java -index cc1b03eb..15be7128 100644 +index cc1b03eb2..15be7128b 100644 --- a/src/main/java/org/bukkit/event/player/PlayerBucketFillEvent.java +++ b/src/main/java/org/bukkit/event/player/PlayerBucketFillEvent.java @@ -5,6 +5,7 @@ import org.bukkit.block.Block; diff --git a/Spigot-API-Patches/0131-Add-TNTPrimeEvent.patch b/Spigot-API-Patches/0131-Add-TNTPrimeEvent.patch index 95ec57def2..fb9aafc45f 100644 --- a/Spigot-API-Patches/0131-Add-TNTPrimeEvent.patch +++ b/Spigot-API-Patches/0131-Add-TNTPrimeEvent.patch @@ -1,4 +1,4 @@ -From 96c816ec45a4ca04d09c5c1c4d13a92d0a5c03ff Mon Sep 17 00:00:00 2001 +From a27650e9c4504636faf89787a78882c0b559f733 Mon Sep 17 00:00:00 2001 From: Mark Vainomaa Date: Sun, 15 Jul 2018 22:17:55 +0300 Subject: [PATCH] Add TNTPrimeEvent @@ -6,7 +6,7 @@ Subject: [PATCH] Add TNTPrimeEvent diff --git a/src/main/java/com/destroystokyo/paper/event/block/TNTPrimeEvent.java b/src/main/java/com/destroystokyo/paper/event/block/TNTPrimeEvent.java new file mode 100644 -index 00000000..73dabb82 +index 000000000..73dabb82c --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/event/block/TNTPrimeEvent.java @@ -0,0 +1,114 @@ 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 fe7e900bc8..9257fd1079 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 264c6b1962030a6be05560d8ec5feca1ad5912a1 Mon Sep 17 00:00:00 2001 +From e36b112a54c0cc7fe5ebcad4638977eaf24651ff Mon Sep 17 00:00:00 2001 From: Aikar Date: Sat, 4 Aug 2018 19:37:35 -0400 Subject: [PATCH] Provide Chunk Coordinates as a Long API @@ -7,7 +7,7 @@ Allows you to easily access the chunks X/z as a long, and a method to look up by the long key too. diff --git a/src/main/java/org/bukkit/Chunk.java b/src/main/java/org/bukkit/Chunk.java -index aab292e1..fe77e33a 100644 +index aab292e1a..fe77e33ae 100644 --- a/src/main/java/org/bukkit/Chunk.java +++ b/src/main/java/org/bukkit/Chunk.java @@ -24,6 +24,32 @@ public interface Chunk { @@ -44,7 +44,7 @@ index aab292e1..fe77e33a 100644 * Gets the world containing this chunk * diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java -index 0b328315..32be5210 100644 +index 0b3283153..32be52109 100644 --- a/src/main/java/org/bukkit/World.java +++ b/src/main/java/org/bukkit/World.java @@ -157,6 +157,22 @@ public interface World extends PluginMessageRecipient, Metadatable { diff --git a/Spigot-API-Patches/0133-Async-Chunks-API.patch b/Spigot-API-Patches/0133-Async-Chunks-API.patch index be39de5b2b..0abb19afa4 100644 --- a/Spigot-API-Patches/0133-Async-Chunks-API.patch +++ b/Spigot-API-Patches/0133-Async-Chunks-API.patch @@ -1,4 +1,4 @@ -From aec44c58717f140b7090af2f2620b84834a1a8c5 Mon Sep 17 00:00:00 2001 +From b2ca19e68cca1b50019c15bdec7c42a11366fe2b Mon Sep 17 00:00:00 2001 From: Aikar Date: Mon, 29 Feb 2016 17:43:33 -0600 Subject: [PATCH] Async Chunks API @@ -8,7 +8,7 @@ Adds API's to load or generate chunks asynchronously. Also adds utility methods to Entity to teleport asynchronously. diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java -index 32be5210..0981675d 100644 +index 32be52109..0981675de 100644 --- a/src/main/java/org/bukkit/World.java +++ b/src/main/java/org/bukkit/World.java @@ -171,6 +171,358 @@ public interface World extends PluginMessageRecipient, Metadatable { @@ -371,7 +371,7 @@ index 32be5210..0981675d 100644 /** diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java -index 2d3cee14..f41243f9 100644 +index 2d3cee140..f41243f92 100644 --- a/src/main/java/org/bukkit/entity/Entity.java +++ b/src/main/java/org/bukkit/entity/Entity.java @@ -157,6 +157,30 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent diff --git a/Spigot-API-Patches/0134-Make-EnderDragon-extend-Mob.patch b/Spigot-API-Patches/0134-Make-EnderDragon-extend-Mob.patch index ae52f67d75..ad1ba4c673 100644 --- a/Spigot-API-Patches/0134-Make-EnderDragon-extend-Mob.patch +++ b/Spigot-API-Patches/0134-Make-EnderDragon-extend-Mob.patch @@ -1,11 +1,11 @@ -From 30650b84b3420d53f9cc3fabb31dfdb7502d0874 Mon Sep 17 00:00:00 2001 +From e37bfa18b4d23e1963b4b65b2f0754b3fb6acbb4 Mon Sep 17 00:00:00 2001 From: Aikar Date: Fri, 10 Aug 2018 22:08:34 -0400 Subject: [PATCH] Make EnderDragon extend Mob diff --git a/src/main/java/org/bukkit/entity/EnderDragon.java b/src/main/java/org/bukkit/entity/EnderDragon.java -index 16199b3e..ddef550b 100644 +index 16199b3e9..ddef550bb 100644 --- a/src/main/java/org/bukkit/entity/EnderDragon.java +++ b/src/main/java/org/bukkit/entity/EnderDragon.java @@ -5,7 +5,7 @@ import org.jetbrains.annotations.NotNull; 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 00f6b00f44..6bef229bd8 100644 --- a/Spigot-API-Patches/0135-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch +++ b/Spigot-API-Patches/0135-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch @@ -1,11 +1,11 @@ -From e6a44197c43bc5f8f1284bcaf5eead766ceabf07 Mon Sep 17 00:00:00 2001 +From 22717e5dfe899085bd631e70b10af96fc42c20d3 Mon Sep 17 00:00:00 2001 From: Aikar Date: Wed, 15 Aug 2018 01:04:58 -0400 Subject: [PATCH] Ability to get Tile Entities from a chunk without snapshots diff --git a/src/main/java/org/bukkit/Chunk.java b/src/main/java/org/bukkit/Chunk.java -index fe77e33a..6d45a421 100644 +index fe77e33ae..6d45a4213 100644 --- a/src/main/java/org/bukkit/Chunk.java +++ b/src/main/java/org/bukkit/Chunk.java @@ -99,13 +99,26 @@ public interface Chunk { 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 14579fefa3..73a23109aa 100644 --- a/Spigot-API-Patches/0136-Don-t-use-snapshots-for-Timings-Tile-Entity-reports.patch +++ b/Spigot-API-Patches/0136-Don-t-use-snapshots-for-Timings-Tile-Entity-reports.patch @@ -1,11 +1,11 @@ -From 458a068274864314ed1431505a754d8c26efdc7b Mon Sep 17 00:00:00 2001 +From 14d611183c822039d1525d7ef6f3d4ea8ec74a14 Mon Sep 17 00:00:00 2001 From: Aikar Date: Wed, 15 Aug 2018 01:19:37 -0400 Subject: [PATCH] Don't use snapshots for Timings Tile Entity reports diff --git a/src/main/java/co/aikar/timings/TimingHistory.java b/src/main/java/co/aikar/timings/TimingHistory.java -index ddaed812..203cda0f 100644 +index ddaed8127..203cda0f9 100644 --- a/src/main/java/co/aikar/timings/TimingHistory.java +++ b/src/main/java/co/aikar/timings/TimingHistory.java @@ -119,7 +119,7 @@ public class TimingHistory { 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 57458ada36..b8009ebcb3 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 2aad459cfeca77582f8f789f4f0b8c45fa215cf3 Mon Sep 17 00:00:00 2001 +From d20be3191ea0dac2ad5abe0dd92319154017275c Mon Sep 17 00:00:00 2001 From: Spottedleaf Date: Tue, 14 Aug 2018 21:42:10 -0700 Subject: [PATCH] Allow Blocks to be accessed via a long key @@ -18,7 +18,7 @@ Y range: [0, 1023] X, Z range: [-67 108 864, 67 108 863] diff --git a/src/main/java/org/bukkit/Location.java b/src/main/java/org/bukkit/Location.java -index 884862ab..6dc39989 100644 +index 884862ab7..6dc399899 100644 --- a/src/main/java/org/bukkit/Location.java +++ b/src/main/java/org/bukkit/Location.java @@ -15,7 +15,6 @@ import org.jetbrains.annotations.Nullable; @@ -48,7 +48,7 @@ index 884862ab..6dc39989 100644 * @return A new location where X/Y/Z are the center of the block */ diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java -index 0981675d..c840d474 100644 +index 0981675de..c840d4744 100644 --- a/src/main/java/org/bukkit/World.java +++ b/src/main/java/org/bukkit/World.java @@ -88,6 +88,38 @@ public interface World extends PluginMessageRecipient, Metadatable { @@ -91,7 +91,7 @@ index 0981675d..c840d474 100644 * Gets the y coordinate of the lowest block at this position such that the * block and all blocks above it are transparent for lighting purposes. diff --git a/src/main/java/org/bukkit/block/Block.java b/src/main/java/org/bukkit/block/Block.java -index af4ffada..87185a81 100644 +index af4ffada0..87185a812 100644 --- a/src/main/java/org/bukkit/block/Block.java +++ b/src/main/java/org/bukkit/block/Block.java @@ -152,6 +152,72 @@ public interface Block extends Metadatable { diff --git a/Spigot-API-Patches/0138-Slime-Pathfinder-Events.patch b/Spigot-API-Patches/0138-Slime-Pathfinder-Events.patch index b10f9bae7f..8a1ab5c88a 100644 --- a/Spigot-API-Patches/0138-Slime-Pathfinder-Events.patch +++ b/Spigot-API-Patches/0138-Slime-Pathfinder-Events.patch @@ -1,4 +1,4 @@ -From 9d084a90bc57d9c80340084020b529024199e259 Mon Sep 17 00:00:00 2001 +From ff3c1411a259a5af0eb7120330e635d081c48c84 Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Fri, 24 Aug 2018 08:18:27 -0500 Subject: [PATCH] Slime Pathfinder Events @@ -6,7 +6,7 @@ Subject: [PATCH] Slime Pathfinder Events diff --git a/src/main/java/com/destroystokyo/paper/event/entity/SlimeChangeDirectionEvent.java b/src/main/java/com/destroystokyo/paper/event/entity/SlimeChangeDirectionEvent.java new file mode 100644 -index 00000000..2638bbd3 +index 000000000..2638bbd3e --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/event/entity/SlimeChangeDirectionEvent.java @@ -0,0 +1,38 @@ @@ -50,7 +50,7 @@ index 00000000..2638bbd3 +} diff --git a/src/main/java/com/destroystokyo/paper/event/entity/SlimePathfindEvent.java b/src/main/java/com/destroystokyo/paper/event/entity/SlimePathfindEvent.java new file mode 100644 -index 00000000..14b67da1 +index 000000000..14b67da10 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/event/entity/SlimePathfindEvent.java @@ -0,0 +1,53 @@ @@ -109,7 +109,7 @@ index 00000000..14b67da1 +} diff --git a/src/main/java/com/destroystokyo/paper/event/entity/SlimeSwimEvent.java b/src/main/java/com/destroystokyo/paper/event/entity/SlimeSwimEvent.java new file mode 100644 -index 00000000..c8dd49d1 +index 000000000..c8dd49d11 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/event/entity/SlimeSwimEvent.java @@ -0,0 +1,17 @@ @@ -132,7 +132,7 @@ index 00000000..c8dd49d1 +} diff --git a/src/main/java/com/destroystokyo/paper/event/entity/SlimeTargetLivingEntityEvent.java b/src/main/java/com/destroystokyo/paper/event/entity/SlimeTargetLivingEntityEvent.java new file mode 100644 -index 00000000..e9ba3279 +index 000000000..e9ba32799 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/event/entity/SlimeTargetLivingEntityEvent.java @@ -0,0 +1,31 @@ @@ -169,7 +169,7 @@ index 00000000..e9ba3279 +} diff --git a/src/main/java/com/destroystokyo/paper/event/entity/SlimeWanderEvent.java b/src/main/java/com/destroystokyo/paper/event/entity/SlimeWanderEvent.java new file mode 100644 -index 00000000..4683a723 +index 000000000..4683a7237 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/event/entity/SlimeWanderEvent.java @@ -0,0 +1,17 @@ @@ -191,7 +191,7 @@ index 00000000..4683a723 + } +} diff --git a/src/main/java/org/bukkit/entity/Slime.java b/src/main/java/org/bukkit/entity/Slime.java -index 1119e26e..c4791f95 100644 +index 1119e26e2..c4791f95d 100644 --- a/src/main/java/org/bukkit/entity/Slime.java +++ b/src/main/java/org/bukkit/entity/Slime.java @@ -14,4 +14,20 @@ public interface Slime extends Mob { diff --git a/Spigot-API-Patches/0139-isChunkGenerated-API.patch b/Spigot-API-Patches/0139-isChunkGenerated-API.patch index 59d0214f27..f5b80d2f2f 100644 --- a/Spigot-API-Patches/0139-isChunkGenerated-API.patch +++ b/Spigot-API-Patches/0139-isChunkGenerated-API.patch @@ -1,11 +1,11 @@ -From 315d168b275c290a695675d69d7b354724a6a1ec Mon Sep 17 00:00:00 2001 +From ff382bb3c8b57fce381883928c1e401f85964a97 Mon Sep 17 00:00:00 2001 From: cswhite2000 <18whitechristop@gmail.com> Date: Tue, 21 Aug 2018 19:39:46 -0700 Subject: [PATCH] isChunkGenerated API diff --git a/src/main/java/org/bukkit/Location.java b/src/main/java/org/bukkit/Location.java -index 6dc39989..4e69f277 100644 +index 6dc399899..4e69f277b 100644 --- a/src/main/java/org/bukkit/Location.java +++ b/src/main/java/org/bukkit/Location.java @@ -3,6 +3,7 @@ package org.bukkit; @@ -34,7 +34,7 @@ index 6dc39989..4e69f277 100644 /** * Sets the position of this Location and returns itself diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java -index c840d474..93dd8742 100644 +index c840d4744..93dd8742a 100644 --- a/src/main/java/org/bukkit/World.java +++ b/src/main/java/org/bukkit/World.java @@ -204,6 +204,17 @@ public interface World extends PluginMessageRecipient, Metadatable { diff --git a/Spigot-API-Patches/0140-Add-More-Creeper-API.patch b/Spigot-API-Patches/0140-Add-More-Creeper-API.patch index 540ffead4c..f0fbf28c50 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 3c26fbdbcb3bd7ccc1123ba0aac7189c0b7103c1 Mon Sep 17 00:00:00 2001 +From d01734b252e0693dc6e185bae421d1abcf980a77 Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Fri, 24 Aug 2018 11:50:16 -0500 Subject: [PATCH] Add More Creeper API @@ -6,7 +6,7 @@ Subject: [PATCH] Add More Creeper API diff --git a/src/main/java/com/destroystokyo/paper/event/entity/CreeperIgniteEvent.java b/src/main/java/com/destroystokyo/paper/event/entity/CreeperIgniteEvent.java new file mode 100644 -index 00000000..ff10251b +index 000000000..ff10251b6 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/event/entity/CreeperIgniteEvent.java @@ -0,0 +1,54 @@ @@ -65,7 +65,7 @@ index 00000000..ff10251b + } +} diff --git a/src/main/java/org/bukkit/entity/Creeper.java b/src/main/java/org/bukkit/entity/Creeper.java -index 32f18a3a..601ba4af 100644 +index 32f18a3ae..601ba4afe 100644 --- a/src/main/java/org/bukkit/entity/Creeper.java +++ b/src/main/java/org/bukkit/entity/Creeper.java @@ -50,4 +50,32 @@ public interface Creeper extends Monster { diff --git a/Spigot-API-Patches/0141-Add-PhantomPreSpawnEvent.patch b/Spigot-API-Patches/0141-Add-PhantomPreSpawnEvent.patch index 37d79d92bc..e0b127b5ab 100644 --- a/Spigot-API-Patches/0141-Add-PhantomPreSpawnEvent.patch +++ b/Spigot-API-Patches/0141-Add-PhantomPreSpawnEvent.patch @@ -1,4 +1,4 @@ -From b188e6eab15294ab8d21056780b149632aa13317 Mon Sep 17 00:00:00 2001 +From 15d02a5dd8023b8d927327a8ce0cd3bc4d345e5f Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Sat, 25 Aug 2018 19:56:42 -0500 Subject: [PATCH] Add PhantomPreSpawnEvent @@ -6,7 +6,7 @@ Subject: [PATCH] Add PhantomPreSpawnEvent diff --git a/src/main/java/com/destroystokyo/paper/event/entity/PhantomPreSpawnEvent.java b/src/main/java/com/destroystokyo/paper/event/entity/PhantomPreSpawnEvent.java new file mode 100644 -index 00000000..9022f697 +index 000000000..9022f697a --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/event/entity/PhantomPreSpawnEvent.java @@ -0,0 +1,31 @@ @@ -42,7 +42,7 @@ index 00000000..9022f697 + } +} diff --git a/src/main/java/org/bukkit/entity/Phantom.java b/src/main/java/org/bukkit/entity/Phantom.java -index 1a1044ed..ed4d417c 100644 +index 1a1044edc..ed4d417c2 100644 --- a/src/main/java/org/bukkit/entity/Phantom.java +++ b/src/main/java/org/bukkit/entity/Phantom.java @@ -1,5 +1,8 @@ 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 69705d1352..dc1f558a4b 100644 --- a/Spigot-API-Patches/0142-Add-source-block-to-BlockPhysicsEvent.patch +++ b/Spigot-API-Patches/0142-Add-source-block-to-BlockPhysicsEvent.patch @@ -1,11 +1,11 @@ -From 76457191674e513142d7e2e289b018cafe854e85 Mon Sep 17 00:00:00 2001 +From 446dc35778696bae18421ca76dd286f4b5388bfe Mon Sep 17 00:00:00 2001 From: Sotr Date: Thu, 23 Aug 2018 16:14:25 +0800 Subject: [PATCH] Add source block to BlockPhysicsEvent diff --git a/src/main/java/org/bukkit/event/block/BlockPhysicsEvent.java b/src/main/java/org/bukkit/event/block/BlockPhysicsEvent.java -index e3a5f582..c382f9fc 100644 +index e3a5f5824..c382f9fc2 100644 --- a/src/main/java/org/bukkit/event/block/BlockPhysicsEvent.java +++ b/src/main/java/org/bukkit/event/block/BlockPhysicsEvent.java @@ -32,6 +32,13 @@ public class BlockPhysicsEvent extends BlockEvent implements Cancellable { diff --git a/Spigot-API-Patches/0143-Inventory-removeItemAnySlot.patch b/Spigot-API-Patches/0143-Inventory-removeItemAnySlot.patch index 1ce9be7759..6e1fd79f04 100644 --- a/Spigot-API-Patches/0143-Inventory-removeItemAnySlot.patch +++ b/Spigot-API-Patches/0143-Inventory-removeItemAnySlot.patch @@ -1,11 +1,11 @@ -From f15c9148fdb45e7f951a8621ba7ae96bd2579a6b Mon Sep 17 00:00:00 2001 +From 2154ec32d5c7b52af2455aa11c02e6ec314c73d2 Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Tue, 28 Aug 2018 23:04:06 -0400 Subject: [PATCH] Inventory#removeItemAnySlot diff --git a/src/main/java/org/bukkit/inventory/Inventory.java b/src/main/java/org/bukkit/inventory/Inventory.java -index 5a38d8f1..01fe217d 100644 +index 5a38d8f13..01fe217df 100644 --- a/src/main/java/org/bukkit/inventory/Inventory.java +++ b/src/main/java/org/bukkit/inventory/Inventory.java @@ -125,6 +125,34 @@ public interface Inventory extends Iterable { 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 f54533bfb2..a4fb48c051 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 246a3f9429755931b2290bb3f50dee71335b5532 Mon Sep 17 00:00:00 2001 +From d96ef889e3f9d82cf1c2c9b92e5d29e34718c1aa Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Mon, 3 Sep 2018 18:13:53 -0500 Subject: [PATCH] Add ray tracing methods to LivingEntity @@ -6,7 +6,7 @@ Subject: [PATCH] Add ray tracing methods to LivingEntity diff --git a/src/main/java/com/destroystokyo/paper/block/TargetBlockInfo.java b/src/main/java/com/destroystokyo/paper/block/TargetBlockInfo.java new file mode 100644 -index 00000000..18a96dbb +index 000000000..18a96dbb0 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/block/TargetBlockInfo.java @@ -0,0 +1,54 @@ @@ -65,7 +65,7 @@ index 00000000..18a96dbb + } +} diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java -index 6e3284b2..9dc0d4ce 100644 +index 6e3284b20..9dc0d4ce3 100644 --- a/src/main/java/org/bukkit/entity/LivingEntity.java +++ b/src/main/java/org/bukkit/entity/LivingEntity.java @@ -81,6 +81,77 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource diff --git a/Spigot-API-Patches/0145-Improve-death-events.patch b/Spigot-API-Patches/0145-Improve-death-events.patch index e1a1a53ae7..c57c38693e 100644 --- a/Spigot-API-Patches/0145-Improve-death-events.patch +++ b/Spigot-API-Patches/0145-Improve-death-events.patch @@ -1,4 +1,4 @@ -From 0ef3566b5a658cc35b2a2bc140bbb74461142aaf Mon Sep 17 00:00:00 2001 +From 9206bdf0ab3cda3c8481d0273f355c6357b46996 Mon Sep 17 00:00:00 2001 From: Phoenix616 Date: Tue, 21 Aug 2018 01:32:28 +0100 Subject: [PATCH] Improve death events @@ -15,7 +15,7 @@ items and experience which is otherwise only properly possible by using internal code. diff --git a/src/main/java/org/bukkit/event/entity/EntityDeathEvent.java b/src/main/java/org/bukkit/event/entity/EntityDeathEvent.java -index a5984ab0..e19a3df9 100644 +index a5984ab06..e19a3df9a 100644 --- a/src/main/java/org/bukkit/event/entity/EntityDeathEvent.java +++ b/src/main/java/org/bukkit/event/entity/EntityDeathEvent.java @@ -5,14 +5,24 @@ import org.bukkit.entity.LivingEntity; diff --git a/Spigot-API-Patches/0146-Mob-Pathfinding-API.patch b/Spigot-API-Patches/0146-Mob-Pathfinding-API.patch index fde54cbd99..3f2aa9b91b 100644 --- a/Spigot-API-Patches/0146-Mob-Pathfinding-API.patch +++ b/Spigot-API-Patches/0146-Mob-Pathfinding-API.patch @@ -1,4 +1,4 @@ -From ba38e6dbbb812cac523fe052e7ec50e582cf057b Mon Sep 17 00:00:00 2001 +From 6a2a957384611cc05aedd0a14c13f49541b02538 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sun, 9 Sep 2018 12:39:06 -0400 Subject: [PATCH] Mob Pathfinding API @@ -13,7 +13,7 @@ You can use EntityPathfindEvent to cancel new pathfinds from overriding your cur diff --git a/src/main/java/com/destroystokyo/paper/entity/Pathfinder.java b/src/main/java/com/destroystokyo/paper/entity/Pathfinder.java new file mode 100644 -index 00000000..8b90a905 +index 000000000..8b90a9053 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/entity/Pathfinder.java @@ -0,0 +1,170 @@ @@ -188,7 +188,7 @@ index 00000000..8b90a905 + } +} diff --git a/src/main/java/org/bukkit/entity/Mob.java b/src/main/java/org/bukkit/entity/Mob.java -index 838440ff..afdc103f 100644 +index 838440ff8..afdc103fe 100644 --- a/src/main/java/org/bukkit/entity/Mob.java +++ b/src/main/java/org/bukkit/entity/Mob.java @@ -1,6 +1,7 @@ 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 08a352868a..0dbd87a34f 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,11 +1,11 @@ -From 4a916b6e1b8261a773ad37167862a35f252b2e57 Mon Sep 17 00:00:00 2001 +From 0f860044a9ef10a4e44c28bd2a638b8d0ed8d2e5 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 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java -index 32dc1f86..dea6130a 100644 +index 32dc1f868..dea6130a6 100644 --- a/src/main/java/org/bukkit/entity/Player.java +++ b/src/main/java/org/bukkit/entity/Player.java @@ -1929,6 +1929,26 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM 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 33ef543ef2..4c352026f6 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 48fae9e9abaaa7d899074299fb920a37fd95d2b0 Mon Sep 17 00:00:00 2001 +From 3ebe1e48a13ec4e9513f4e9a8583174e700803ac 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 @@ -6,7 +6,7 @@ Subject: [PATCH] Add an API for CanPlaceOn and CanDestroy NBT values diff --git a/src/main/java/com/destroystokyo/paper/Namespaced.java b/src/main/java/com/destroystokyo/paper/Namespaced.java new file mode 100644 -index 00000000..cd1a34b8 +index 000000000..cd1a34b82 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/Namespaced.java @@ -0,0 +1,40 @@ @@ -52,7 +52,7 @@ index 00000000..cd1a34b8 +} diff --git a/src/main/java/com/destroystokyo/paper/NamespacedTag.java b/src/main/java/com/destroystokyo/paper/NamespacedTag.java new file mode 100644 -index 00000000..28f3fda9 +index 000000000..28f3fda95 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/NamespacedTag.java @@ -0,0 +1,142 @@ @@ -199,7 +199,7 @@ index 00000000..28f3fda9 + } +} diff --git a/src/main/java/org/bukkit/NamespacedKey.java b/src/main/java/org/bukkit/NamespacedKey.java -index 22eca2a1..620a962d 100644 +index 22eca2a18..620a962df 100644 --- a/src/main/java/org/bukkit/NamespacedKey.java +++ b/src/main/java/org/bukkit/NamespacedKey.java @@ -18,7 +18,7 @@ import org.jetbrains.annotations.NotNull; @@ -226,7 +226,7 @@ index 22eca2a1..620a962d 100644 return key; } diff --git a/src/main/java/org/bukkit/inventory/meta/ItemMeta.java b/src/main/java/org/bukkit/inventory/meta/ItemMeta.java -index 4e8c7a8a..595df539 100644 +index 4e8c7a8ac..595df539b 100644 --- a/src/main/java/org/bukkit/inventory/meta/ItemMeta.java +++ b/src/main/java/org/bukkit/inventory/meta/ItemMeta.java @@ -421,4 +421,86 @@ public interface ItemMeta extends Cloneable, ConfigurationSerializable, Persiste 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 b3d87754f9..ba5daa6710 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 31a97ee3841d55754647d0751fed2a488e4139e3 Mon Sep 17 00:00:00 2001 +From a38efbd0711edf597edac7f46a47588771adb207 Mon Sep 17 00:00:00 2001 From: Aikar Date: Thu, 13 Sep 2018 20:51:50 -0400 Subject: [PATCH] Performance & Concurrency Improvements to Permissions @@ -18,7 +18,7 @@ Optimized it to simply be a single get call cutting permission map lookups in half. diff --git a/src/main/java/org/bukkit/permissions/PermissibleBase.java b/src/main/java/org/bukkit/permissions/PermissibleBase.java -index 497775f7..c94e4cdb 100644 +index 497775f7f..c94e4cdb5 100644 --- a/src/main/java/org/bukkit/permissions/PermissibleBase.java +++ b/src/main/java/org/bukkit/permissions/PermissibleBase.java @@ -75,8 +75,11 @@ public class PermissibleBase implements Permissible { diff --git a/Spigot-API-Patches/0150-Add-ItemStackRecipeChoice-Draft-API.patch b/Spigot-API-Patches/0150-Add-ItemStackRecipeChoice-Draft-API.patch index 13a30dbb8c..0be9130fb7 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 6e774a6907d67c987be6902cd85aa7e713d2ad57 Mon Sep 17 00:00:00 2001 +From e33137ecd10d2cff67f548ff013fd7ee76ab126a Mon Sep 17 00:00:00 2001 From: Aikar Date: Thu, 13 Sep 2018 21:39:26 -0400 Subject: [PATCH] Add ItemStackRecipeChoice Draft API @@ -9,7 +9,7 @@ Allows creating recipes that must match isSimilar to full item stack. diff --git a/src/main/java/com/destroystokyo/paper/inventory/ItemStackRecipeChoice.java b/src/main/java/com/destroystokyo/paper/inventory/ItemStackRecipeChoice.java new file mode 100644 -index 00000000..43e6576b +index 000000000..43e6576b1 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/inventory/ItemStackRecipeChoice.java @@ -0,0 +1,51 @@ 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 28cca89da9..2f57e9e2b5 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 7441129221dd49a2239f47e7d4237683baa56bbd Mon Sep 17 00:00:00 2001 +From f0b766722ea558d457ecd3f7b508a5f14bc45eb3 Mon Sep 17 00:00:00 2001 From: Tassu Date: Thu, 13 Sep 2018 08:45:01 +0300 Subject: [PATCH] Implement furnace cook speed multiplier API @@ -6,7 +6,7 @@ Subject: [PATCH] Implement furnace cook speed multiplier API Signed-off-by: Tassu diff --git a/src/main/java/org/bukkit/block/Furnace.java b/src/main/java/org/bukkit/block/Furnace.java -index c5a8c96f..9063cf37 100644 +index c5a8c96fa..9063cf370 100644 --- a/src/main/java/org/bukkit/block/Furnace.java +++ b/src/main/java/org/bukkit/block/Furnace.java @@ -61,6 +61,26 @@ public interface Furnace extends Container { diff --git a/Spigot-API-Patches/0152-PreSpawnerSpawnEvent.patch b/Spigot-API-Patches/0152-PreSpawnerSpawnEvent.patch index 4456faad7f..53b3558dc6 100644 --- a/Spigot-API-Patches/0152-PreSpawnerSpawnEvent.patch +++ b/Spigot-API-Patches/0152-PreSpawnerSpawnEvent.patch @@ -1,4 +1,4 @@ -From 1499f72bc455c5b57447ed95902712a585fa204b Mon Sep 17 00:00:00 2001 +From 2b184dba3960faeccc71da310a3282b73d1db305 Mon Sep 17 00:00:00 2001 From: Phoenix616 Date: Tue, 18 Sep 2018 23:50:10 +0100 Subject: [PATCH] PreSpawnerSpawnEvent @@ -10,7 +10,7 @@ spawners. diff --git a/src/main/java/com/destroystokyo/paper/event/entity/PreSpawnerSpawnEvent.java b/src/main/java/com/destroystokyo/paper/event/entity/PreSpawnerSpawnEvent.java new file mode 100644 -index 00000000..48cff063 +index 000000000..48cff0635 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/event/entity/PreSpawnerSpawnEvent.java @@ -0,0 +1,29 @@ 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 98671b0dfa..5714fde437 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 e718538a8b3799242006d95332319c9de15f4f3b Mon Sep 17 00:00:00 2001 +From e5c5e2fec05cfa56a7f27dcc267871020716052b Mon Sep 17 00:00:00 2001 From: Aikar Date: Sat, 22 Sep 2018 18:41:01 -0400 Subject: [PATCH] Remove Precondition on name for AttributeModifier @@ -6,7 +6,7 @@ Subject: [PATCH] Remove Precondition on name for AttributeModifier Vanilla allows empty names diff --git a/src/main/java/org/bukkit/attribute/AttributeModifier.java b/src/main/java/org/bukkit/attribute/AttributeModifier.java -index a9763147..f0dff145 100644 +index a97631474..f0dff145a 100644 --- a/src/main/java/org/bukkit/attribute/AttributeModifier.java +++ b/src/main/java/org/bukkit/attribute/AttributeModifier.java @@ -32,10 +32,10 @@ public class AttributeModifier implements ConfigurationSerializable { diff --git a/Spigot-API-Patches/0154-Material-API-additions.patch b/Spigot-API-Patches/0154-Material-API-additions.patch index 50b10db4d5..05425acaec 100644 --- a/Spigot-API-Patches/0154-Material-API-additions.patch +++ b/Spigot-API-Patches/0154-Material-API-additions.patch @@ -1,11 +1,11 @@ -From ca41b95550077f665eafda0196e09f76153f6a86 Mon Sep 17 00:00:00 2001 +From 5cfd6d8b87b933622537b885a63adafe69245b0b Mon Sep 17 00:00:00 2001 From: Aikar Date: Sat, 6 Oct 2018 21:14:29 -0400 Subject: [PATCH] Material API additions diff --git a/src/main/java/org/bukkit/Material.java b/src/main/java/org/bukkit/Material.java -index b9838dc9..9a1c3724 100644 +index b9838dc96..9a1c37248 100644 --- a/src/main/java/org/bukkit/Material.java +++ b/src/main/java/org/bukkit/Material.java @@ -80,6 +80,7 @@ import org.jetbrains.annotations.Nullable; diff --git a/Spigot-API-Patches/0155-Add-Material-Tags.patch b/Spigot-API-Patches/0155-Add-Material-Tags.patch index 59bffa3401..5a6c0705b2 100644 --- a/Spigot-API-Patches/0155-Add-Material-Tags.patch +++ b/Spigot-API-Patches/0155-Add-Material-Tags.patch @@ -1,4 +1,4 @@ -From ce227832021b02e082e046553625657ca85aed9e Mon Sep 17 00:00:00 2001 +From 59b99f7b39dcb3ddc19fced19188e7b927e713f9 Mon Sep 17 00:00:00 2001 From: Aikar Date: Tue, 17 Jul 2018 01:27:15 -0400 Subject: [PATCH] Add Material Tags @@ -8,7 +8,7 @@ are related to each other by a trait. diff --git a/src/main/java/com/destroystokyo/paper/MaterialSetTag.java b/src/main/java/com/destroystokyo/paper/MaterialSetTag.java new file mode 100644 -index 00000000..c91ea2a0 +index 000000000..c91ea2a06 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/MaterialSetTag.java @@ -0,0 +1,190 @@ @@ -204,7 +204,7 @@ index 00000000..c91ea2a0 +} diff --git a/src/main/java/com/destroystokyo/paper/MaterialTags.java b/src/main/java/com/destroystokyo/paper/MaterialTags.java new file mode 100644 -index 00000000..ef1e2c19 +index 000000000..ef1e2c191 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/MaterialTags.java @@ -0,0 +1,374 @@ @@ -584,7 +584,7 @@ index 00000000..ef1e2c19 +} diff --git a/src/test/java/com/destroystokyo/paper/MaterialTagsTest.java b/src/test/java/com/destroystokyo/paper/MaterialTagsTest.java new file mode 100644 -index 00000000..328c5147 +index 000000000..328c51471 --- /dev/null +++ b/src/test/java/com/destroystokyo/paper/MaterialTagsTest.java @@ -0,0 +1,25 @@ @@ -614,7 +614,7 @@ index 00000000..328c5147 + } +} diff --git a/src/test/java/org/bukkit/TestServer.java b/src/test/java/org/bukkit/TestServer.java -index 61993528..5f9d3482 100644 +index 61993528e..5f9d34824 100644 --- a/src/test/java/org/bukkit/TestServer.java +++ b/src/test/java/org/bukkit/TestServer.java @@ -29,6 +29,16 @@ public final class TestServer implements InvocationHandler { 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 2dbfe2c7a6..2f5c2c1f3e 100644 --- a/Spigot-API-Patches/0156-Allow-setting-the-vex-s-summoner.patch +++ b/Spigot-API-Patches/0156-Allow-setting-the-vex-s-summoner.patch @@ -1,11 +1,11 @@ -From ad855b07a8a9d5e3ad04f0419e107c4aefa71e23 Mon Sep 17 00:00:00 2001 +From 59830b07555d739af07887b63b319dc26c039973 Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Sat, 6 Oct 2018 21:47:09 -0500 Subject: [PATCH] Allow setting the vex's summoner diff --git a/src/main/java/org/bukkit/entity/Vex.java b/src/main/java/org/bukkit/entity/Vex.java -index 6b61c4ab..c34a3ea7 100644 +index 6b61c4ab7..c34a3ea7b 100644 --- a/src/main/java/org/bukkit/entity/Vex.java +++ b/src/main/java/org/bukkit/entity/Vex.java @@ -1,5 +1,7 @@ diff --git a/Spigot-API-Patches/0157-Add-LivingEntity-getTargetEntity.patch b/Spigot-API-Patches/0157-Add-LivingEntity-getTargetEntity.patch index 311359fe58..04cb99c5d0 100644 --- a/Spigot-API-Patches/0157-Add-LivingEntity-getTargetEntity.patch +++ b/Spigot-API-Patches/0157-Add-LivingEntity-getTargetEntity.patch @@ -1,4 +1,4 @@ -From 04b7f7a20e837a9394b81b148c7b20949846f963 Mon Sep 17 00:00:00 2001 +From f9b3fbe9d88643527fdd6f3f6afcecf9ccbd3a6e Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Sat, 22 Sep 2018 00:32:53 -0500 Subject: [PATCH] Add LivingEntity#getTargetEntity @@ -6,7 +6,7 @@ Subject: [PATCH] Add LivingEntity#getTargetEntity diff --git a/src/main/java/com/destroystokyo/paper/entity/TargetEntityInfo.java b/src/main/java/com/destroystokyo/paper/entity/TargetEntityInfo.java new file mode 100644 -index 00000000..f52644fa +index 000000000..f52644fab --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/entity/TargetEntityInfo.java @@ -0,0 +1,38 @@ @@ -49,7 +49,7 @@ index 00000000..f52644fa + } +} diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java -index 9dc0d4ce..a78f390d 100644 +index 9dc0d4ce3..a78f390d7 100644 --- a/src/main/java/org/bukkit/entity/LivingEntity.java +++ b/src/main/java/org/bukkit/entity/LivingEntity.java @@ -150,6 +150,50 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource diff --git a/Spigot-API-Patches/0158-Add-sun-related-API.patch b/Spigot-API-Patches/0158-Add-sun-related-API.patch index a904fc5ee3..0d30f7d3be 100644 --- a/Spigot-API-Patches/0158-Add-sun-related-API.patch +++ b/Spigot-API-Patches/0158-Add-sun-related-API.patch @@ -1,11 +1,11 @@ -From 469ebbbf30e5e73921440fc6192dfff2e496916d Mon Sep 17 00:00:00 2001 +From 18858c0aac2afc0c238528dd725532e006d2013f Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Sun, 7 Oct 2018 00:54:15 -0500 Subject: [PATCH] Add sun related API diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java -index 93dd8742..1818e158 100644 +index 93dd8742a..1818e158f 100644 --- a/src/main/java/org/bukkit/World.java +++ b/src/main/java/org/bukkit/World.java @@ -1508,6 +1508,16 @@ public interface World extends PluginMessageRecipient, Metadatable { @@ -26,7 +26,7 @@ index 93dd8742..1818e158 100644 * Returns whether the world has an ongoing storm. * diff --git a/src/main/java/org/bukkit/entity/Mob.java b/src/main/java/org/bukkit/entity/Mob.java -index afdc103f..784db447 100644 +index afdc103fe..784db447d 100644 --- a/src/main/java/org/bukkit/entity/Mob.java +++ b/src/main/java/org/bukkit/entity/Mob.java @@ -16,6 +16,13 @@ public interface Mob extends LivingEntity, Lootable { diff --git a/Spigot-API-Patches/0159-Here-s-Johnny.patch b/Spigot-API-Patches/0159-Here-s-Johnny.patch index 1a2933f2f4..b7718becfa 100644 --- a/Spigot-API-Patches/0159-Here-s-Johnny.patch +++ b/Spigot-API-Patches/0159-Here-s-Johnny.patch @@ -1,11 +1,11 @@ -From 6337fde419a1700fa22d8e40995c4cfbdb36a124 Mon Sep 17 00:00:00 2001 +From 3444495725c40d35b1621ba8389a3d0a92c43e4a Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Fri, 12 Oct 2018 01:37:16 -0500 Subject: [PATCH] Here's Johnny! diff --git a/src/main/java/org/bukkit/entity/Vindicator.java b/src/main/java/org/bukkit/entity/Vindicator.java -index b8ea68a8..c5d9e76a 100644 +index b8ea68a8f..c5d9e76a6 100644 --- a/src/main/java/org/bukkit/entity/Vindicator.java +++ b/src/main/java/org/bukkit/entity/Vindicator.java @@ -3,4 +3,30 @@ package org.bukkit.entity; diff --git a/Spigot-API-Patches/0160-Turtle-API.patch b/Spigot-API-Patches/0160-Turtle-API.patch index ed9cfb8211..71892bff21 100644 --- a/Spigot-API-Patches/0160-Turtle-API.patch +++ b/Spigot-API-Patches/0160-Turtle-API.patch @@ -1,4 +1,4 @@ -From f789dbd181102df5658bcd4a048056ab55b5b109 Mon Sep 17 00:00:00 2001 +From ade57d45b19045cf93616df9ce11da2e49697e29 Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Fri, 28 Sep 2018 17:08:09 -0500 Subject: [PATCH] Turtle API @@ -6,7 +6,7 @@ Subject: [PATCH] Turtle API diff --git a/src/main/java/com/destroystokyo/paper/event/entity/TurtleGoHomeEvent.java b/src/main/java/com/destroystokyo/paper/event/entity/TurtleGoHomeEvent.java new file mode 100644 -index 00000000..021356d1 +index 000000000..021356d15 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/event/entity/TurtleGoHomeEvent.java @@ -0,0 +1,49 @@ @@ -61,7 +61,7 @@ index 00000000..021356d1 +} diff --git a/src/main/java/com/destroystokyo/paper/event/entity/TurtleLayEggEvent.java b/src/main/java/com/destroystokyo/paper/event/entity/TurtleLayEggEvent.java new file mode 100644 -index 00000000..a315c518 +index 000000000..a315c5185 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/event/entity/TurtleLayEggEvent.java @@ -0,0 +1,87 @@ @@ -154,7 +154,7 @@ index 00000000..a315c518 +} diff --git a/src/main/java/com/destroystokyo/paper/event/entity/TurtleStartDiggingEvent.java b/src/main/java/com/destroystokyo/paper/event/entity/TurtleStartDiggingEvent.java new file mode 100644 -index 00000000..abeb24fc +index 000000000..abeb24fcc --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/event/entity/TurtleStartDiggingEvent.java @@ -0,0 +1,62 @@ @@ -221,7 +221,7 @@ index 00000000..abeb24fc + } +} diff --git a/src/main/java/org/bukkit/entity/Turtle.java b/src/main/java/org/bukkit/entity/Turtle.java -index 0a4cd299..5375ea14 100644 +index 0a4cd2993..5375ea140 100644 --- a/src/main/java/org/bukkit/entity/Turtle.java +++ b/src/main/java/org/bukkit/entity/Turtle.java @@ -1,6 +1,55 @@ 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 f8488452dd..47a08fd3ee 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 3d3e7ad0541aba872975f6aeba753405727211ec Mon Sep 17 00:00:00 2001 +From 6f0bddd08dc6878011dded2341b9c02f0b2969bb Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Sat, 6 Oct 2018 20:54:13 -0500 Subject: [PATCH] Implement getters and setters for EntityItem owner and @@ -6,7 +6,7 @@ Subject: [PATCH] Implement getters and setters for EntityItem owner and diff --git a/src/main/java/org/bukkit/entity/Item.java b/src/main/java/org/bukkit/entity/Item.java -index cb9e9f36..a15f70ff 100644 +index cb9e9f369..a15f70ff4 100644 --- a/src/main/java/org/bukkit/entity/Item.java +++ b/src/main/java/org/bukkit/entity/Item.java @@ -4,6 +4,10 @@ import org.bukkit.inventory.ItemStack; diff --git a/Spigot-API-Patches/0162-Add-spectator-target-events.patch b/Spigot-API-Patches/0162-Add-spectator-target-events.patch index f07d38f15d..5980e3a81e 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 4304d246418a14fa2bedc2662bd5f9730dc5358f Mon Sep 17 00:00:00 2001 +From 71d000f54e5cba9f8b047d8a88ec46e70922e7eb Mon Sep 17 00:00:00 2001 From: Caleb Bassham Date: Fri, 28 Sep 2018 02:30:56 -0500 Subject: [PATCH] Add spectator target events @@ -8,7 +8,7 @@ Subject: [PATCH] Add spectator target events diff --git a/src/main/java/com/destroystokyo/paper/event/player/PlayerStartSpectatingEntityEvent.java b/src/main/java/com/destroystokyo/paper/event/player/PlayerStartSpectatingEntityEvent.java new file mode 100644 -index 00000000..b8ec7ef2 +index 000000000..b8ec7ef2d --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/event/player/PlayerStartSpectatingEntityEvent.java @@ -0,0 +1,67 @@ @@ -81,7 +81,7 @@ index 00000000..b8ec7ef2 + diff --git a/src/main/java/com/destroystokyo/paper/event/player/PlayerStopSpectatingEntityEvent.java b/src/main/java/com/destroystokyo/paper/event/player/PlayerStopSpectatingEntityEvent.java new file mode 100644 -index 00000000..693d119a +index 000000000..693d119ab --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/event/player/PlayerStopSpectatingEntityEvent.java @@ -0,0 +1,54 @@ diff --git a/Spigot-API-Patches/0163-Add-more-Witch-API.patch b/Spigot-API-Patches/0163-Add-more-Witch-API.patch index 464ece0d7b..e4297693b0 100644 --- a/Spigot-API-Patches/0163-Add-more-Witch-API.patch +++ b/Spigot-API-Patches/0163-Add-more-Witch-API.patch @@ -1,11 +1,11 @@ -From f3be0787b2990390ac5709f7069844505af7b986 Mon Sep 17 00:00:00 2001 +From 2c65ebc830c59e5bb2c88fd1100969ae7c6c85ca Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Fri, 12 Oct 2018 03:47:26 -0500 Subject: [PATCH] Add more Witch API diff --git a/src/main/java/org/bukkit/entity/Witch.java b/src/main/java/org/bukkit/entity/Witch.java -index aa88aede..cd8d0a20 100644 +index aa88aede6..cd8d0a20e 100644 --- a/src/main/java/org/bukkit/entity/Witch.java +++ b/src/main/java/org/bukkit/entity/Witch.java @@ -2,8 +2,43 @@ package org.bukkit.entity; 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 a7987635e9..28fc0667b9 100644 --- a/Spigot-API-Patches/0164-Make-the-default-permission-message-configurable.patch +++ b/Spigot-API-Patches/0164-Make-the-default-permission-message-configurable.patch @@ -1,11 +1,11 @@ -From ba7c668ff92f66c985ec1aa036f1033d05aefe37 Mon Sep 17 00:00:00 2001 +From 43986628fcfdade9f255f4987bc7c951908dad34 Mon Sep 17 00:00:00 2001 From: Shane Freeder Date: Sun, 18 Nov 2018 19:44:54 +0000 Subject: [PATCH] Make the default permission message configurable diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java -index 0c519c41..2148a3c2 100644 +index 0c519c412..2148a3c26 100644 --- a/src/main/java/org/bukkit/Bukkit.java +++ b/src/main/java/org/bukkit/Bukkit.java @@ -1557,6 +1557,15 @@ public final class Bukkit { @@ -25,7 +25,7 @@ index 0c519c41..2148a3c2 100644 * Creates a PlayerProfile for the specified uuid, with name as null * @param uuid UUID to create profile for diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java -index 8a76df52..1cbb9bc6 100644 +index 8a76df524..1cbb9bc66 100644 --- a/src/main/java/org/bukkit/Server.java +++ b/src/main/java/org/bukkit/Server.java @@ -1364,6 +1364,13 @@ public interface Server extends PluginMessageRecipient { @@ -43,7 +43,7 @@ index 8a76df52..1cbb9bc6 100644 * Creates a PlayerProfile for the specified uuid, with name as null * @param uuid UUID to create profile for diff --git a/src/main/java/org/bukkit/command/Command.java b/src/main/java/org/bukkit/command/Command.java -index 03bdc162..0b0d1bd7 100644 +index 03bdc1622..0b0d1bd7c 100644 --- a/src/main/java/org/bukkit/command/Command.java +++ b/src/main/java/org/bukkit/command/Command.java @@ -185,7 +185,7 @@ public abstract class Command { diff --git a/Spigot-API-Patches/0165-Support-cancellation-supression-of-EntityDismount-Ve.patch b/Spigot-API-Patches/0165-Support-cancellation-supression-of-EntityDismount-Ve.patch index efd889ca23..41a6bca8d6 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 6b95712581e254062c8447b0a028beb99ff2bb0b Mon Sep 17 00:00:00 2001 +From 03c545f62a9eb07304bfda60f4a4b37f4e366796 Mon Sep 17 00:00:00 2001 From: Shane Freeder Date: Sun, 18 Nov 2018 15:53:43 +0000 Subject: [PATCH] Support cancellation supression of EntityDismount/VehicleExit @@ -21,7 +21,7 @@ this is going to be the best soultion all around. Improvements/suggestions welcome! diff --git a/src/main/java/org/bukkit/event/vehicle/VehicleExitEvent.java b/src/main/java/org/bukkit/event/vehicle/VehicleExitEvent.java -index 963b9ead..a976c32d 100644 +index 963b9ead4..a976c32de 100644 --- a/src/main/java/org/bukkit/event/vehicle/VehicleExitEvent.java +++ b/src/main/java/org/bukkit/event/vehicle/VehicleExitEvent.java @@ -13,10 +13,18 @@ public class VehicleExitEvent extends VehicleEvent implements Cancellable { @@ -64,7 +64,7 @@ index 963b9ead..a976c32d 100644 @Override public HandlerList getHandlers() { diff --git a/src/main/java/org/spigotmc/event/entity/EntityDismountEvent.java b/src/main/java/org/spigotmc/event/entity/EntityDismountEvent.java -index a473b2c6..a5b4aed5 100644 +index a473b2c6e..a5b4aed52 100644 --- a/src/main/java/org/spigotmc/event/entity/EntityDismountEvent.java +++ b/src/main/java/org/spigotmc/event/entity/EntityDismountEvent.java @@ -16,11 +16,20 @@ public class EntityDismountEvent extends EntityEvent implements Cancellable diff --git a/Spigot-API-Patches/0166-Add-more-Zombie-API.patch b/Spigot-API-Patches/0166-Add-more-Zombie-API.patch index b7946c156c..0f7258dddb 100644 --- a/Spigot-API-Patches/0166-Add-more-Zombie-API.patch +++ b/Spigot-API-Patches/0166-Add-more-Zombie-API.patch @@ -1,11 +1,11 @@ -From 96132c23c6f6504490d612b90428a3545be7f024 Mon Sep 17 00:00:00 2001 +From 6d52ffd4df85eeb17481ff2fc408cbdf7a2ea6e7 Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Sun, 7 Oct 2018 04:29:51 -0500 Subject: [PATCH] Add more Zombie API diff --git a/src/main/java/org/bukkit/entity/Zombie.java b/src/main/java/org/bukkit/entity/Zombie.java -index 6dcac979..fa7a43c3 100644 +index 6dcac9798..fa7a43c35 100644 --- a/src/main/java/org/bukkit/entity/Zombie.java +++ b/src/main/java/org/bukkit/entity/Zombie.java @@ -86,4 +86,55 @@ public interface Zombie extends Monster { 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 1b740898f3..51d8ae5208 100644 --- a/Spigot-API-Patches/0167-Change-the-reserved-channel-check-to-be-sensible.patch +++ b/Spigot-API-Patches/0167-Change-the-reserved-channel-check-to-be-sensible.patch @@ -1,11 +1,11 @@ -From b36a48e067fabe4f9108ef31f6ce6d1373627bf5 Mon Sep 17 00:00:00 2001 +From 7bcebc6e5f1c9713e81eca74e8edff28f2253020 Mon Sep 17 00:00:00 2001 From: DoNotSpamPls <7570108+DoNotSpamPls@users.noreply.github.com> Date: Tue, 23 Oct 2018 19:32:55 +0300 Subject: [PATCH] Change the reserved channel check to be sensible diff --git a/src/main/java/org/bukkit/plugin/messaging/StandardMessenger.java b/src/main/java/org/bukkit/plugin/messaging/StandardMessenger.java -index 1d061412..6fda7f3a 100644 +index 1d061412c..6fda7f3aa 100644 --- a/src/main/java/org/bukkit/plugin/messaging/StandardMessenger.java +++ b/src/main/java/org/bukkit/plugin/messaging/StandardMessenger.java @@ -172,7 +172,7 @@ public class StandardMessenger implements Messenger { @@ -18,7 +18,7 @@ index 1d061412..6fda7f3a 100644 @Override diff --git a/src/test/java/org/bukkit/plugin/messaging/StandardMessengerTest.java b/src/test/java/org/bukkit/plugin/messaging/StandardMessengerTest.java -index dce3d619..7e2335ed 100644 +index dce3d619a..7e2335ed8 100644 --- a/src/test/java/org/bukkit/plugin/messaging/StandardMessengerTest.java +++ b/src/test/java/org/bukkit/plugin/messaging/StandardMessengerTest.java @@ -25,8 +25,8 @@ public class StandardMessengerTest { diff --git a/Spigot-API-Patches/0168-Add-PlayerConnectionCloseEvent.patch b/Spigot-API-Patches/0168-Add-PlayerConnectionCloseEvent.patch index 874da577cc..66ce0374ce 100644 --- a/Spigot-API-Patches/0168-Add-PlayerConnectionCloseEvent.patch +++ b/Spigot-API-Patches/0168-Add-PlayerConnectionCloseEvent.patch @@ -1,4 +1,4 @@ -From 46783a8013a1aa82f42a5c84ae431997e3e4aa87 Mon Sep 17 00:00:00 2001 +From 705078996d8a5dac03de8b75fbde7e9e62739906 Mon Sep 17 00:00:00 2001 From: Spottedleaf Date: Sun, 7 Oct 2018 12:05:06 -0700 Subject: [PATCH] Add PlayerConnectionCloseEvent @@ -35,7 +35,7 @@ is undefined. diff --git a/src/main/java/com/destroystokyo/paper/event/player/PlayerConnectionCloseEvent.java b/src/main/java/com/destroystokyo/paper/event/player/PlayerConnectionCloseEvent.java new file mode 100644 -index 00000000..12c1c6fe +index 000000000..12c1c6fe9 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/event/player/PlayerConnectionCloseEvent.java @@ -0,0 +1,95 @@ 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 f3539b118d..863f2df7ca 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 2cb8c205aecd5cf6721b1732608a91f1ffc647d2 Mon Sep 17 00:00:00 2001 +From 56fb0f85d8e37acbae4728a4bed130141d62701a Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Wed, 2 Jan 2019 00:31:12 -0600 Subject: [PATCH] Add APIs to replace OfflinePlayer#getLastPlayed @@ -16,7 +16,7 @@ intent to remove) and replace it with two new methods, clearly named and documented as to their purpose. diff --git a/src/main/java/org/bukkit/OfflinePlayer.java b/src/main/java/org/bukkit/OfflinePlayer.java -index 222a9a7b..3ab914fb 100644 +index 222a9a7bf..3ab914fb2 100644 --- a/src/main/java/org/bukkit/OfflinePlayer.java +++ b/src/main/java/org/bukkit/OfflinePlayer.java @@ -146,7 +146,9 @@ public interface OfflinePlayer extends ServerOperator, AnimalTamer, Configuratio diff --git a/Spigot-API-Patches/0170-BlockDestroyEvent.patch b/Spigot-API-Patches/0170-BlockDestroyEvent.patch index 168494a5bc..4f305b8c79 100644 --- a/Spigot-API-Patches/0170-BlockDestroyEvent.patch +++ b/Spigot-API-Patches/0170-BlockDestroyEvent.patch @@ -1,4 +1,4 @@ -From 3a8a74faebdfc13c20216048b001baee3de8b0eb Mon Sep 17 00:00:00 2001 +From 91f0a800295e64c1935025ee56348311f366e6ae Mon Sep 17 00:00:00 2001 From: Aikar Date: Wed, 6 Feb 2019 00:19:33 -0500 Subject: [PATCH] BlockDestroyEvent @@ -12,7 +12,7 @@ This can replace many uses of BlockPhysicsEvent diff --git a/src/main/java/com/destroystokyo/paper/event/block/BlockDestroyEvent.java b/src/main/java/com/destroystokyo/paper/event/block/BlockDestroyEvent.java new file mode 100644 -index 00000000..3aee12f1 +index 000000000..3aee12f1c --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/event/block/BlockDestroyEvent.java @@ -0,0 +1,92 @@ 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 f0a13baa46..f9ae44ab9c 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 1e59893d15dc6efa7eccc010b77adb814e57a6aa Mon Sep 17 00:00:00 2001 +From 03a8b7278e3d84ae6a755ff042e71e57896eed22 Mon Sep 17 00:00:00 2001 From: Aikar Date: Tue, 28 Jan 2014 19:13:57 -0500 Subject: [PATCH] Add ItemStack Recipe API helper methods @@ -6,7 +6,7 @@ Subject: [PATCH] Add ItemStack Recipe API helper methods Allows using ExactChoice Recipes with easier methodss diff --git a/src/main/java/org/bukkit/inventory/ShapedRecipe.java b/src/main/java/org/bukkit/inventory/ShapedRecipe.java -index d742c405..222a12ba 100644 +index d742c4058..222a12baa 100644 --- a/src/main/java/org/bukkit/inventory/ShapedRecipe.java +++ b/src/main/java/org/bukkit/inventory/ShapedRecipe.java @@ -145,6 +145,13 @@ public class ShapedRecipe implements Recipe, Keyed { @@ -24,7 +24,7 @@ index d742c405..222a12ba 100644 * Get a copy of the ingredients map. * diff --git a/src/main/java/org/bukkit/inventory/ShapelessRecipe.java b/src/main/java/org/bukkit/inventory/ShapelessRecipe.java -index 84062dd7..ddcf84e6 100644 +index 84062dd71..ddcf84e66 100644 --- a/src/main/java/org/bukkit/inventory/ShapelessRecipe.java +++ b/src/main/java/org/bukkit/inventory/ShapelessRecipe.java @@ -143,6 +143,40 @@ public class ShapelessRecipe implements Recipe, Keyed { diff --git a/Spigot-API-Patches/0172-Add-WhitelistToggleEvent.patch b/Spigot-API-Patches/0172-Add-WhitelistToggleEvent.patch index fa0272bb73..f82588a659 100644 --- a/Spigot-API-Patches/0172-Add-WhitelistToggleEvent.patch +++ b/Spigot-API-Patches/0172-Add-WhitelistToggleEvent.patch @@ -1,4 +1,4 @@ -From 956695150bce0d2d74ba337fd742a403e2edce7f Mon Sep 17 00:00:00 2001 +From 632869cf2be4212dfc81ede42792c14595c80259 Mon Sep 17 00:00:00 2001 From: Mark Vainomaa Date: Wed, 13 Mar 2019 20:04:43 +0200 Subject: [PATCH] Add WhitelistToggleEvent @@ -6,7 +6,7 @@ Subject: [PATCH] Add WhitelistToggleEvent diff --git a/src/main/java/com/destroystokyo/paper/event/server/WhitelistToggleEvent.java b/src/main/java/com/destroystokyo/paper/event/server/WhitelistToggleEvent.java new file mode 100644 -index 00000000..fdd5eedb +index 000000000..fdd5eedb2 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/event/server/WhitelistToggleEvent.java @@ -0,0 +1,40 @@ diff --git a/Spigot-API-Patches/0173-Annotation-Test-changes.patch b/Spigot-API-Patches/0173-Annotation-Test-changes.patch index 0ab3ab1dad..4e17a6ac81 100644 --- a/Spigot-API-Patches/0173-Annotation-Test-changes.patch +++ b/Spigot-API-Patches/0173-Annotation-Test-changes.patch @@ -1,11 +1,11 @@ -From 1a26c0d087846c0ff615263216505475184cf2c4 Mon Sep 17 00:00:00 2001 +From 872953ac6a2dfe184142874033c4629a73e55833 Mon Sep 17 00:00:00 2001 From: Shane Freeder Date: Sun, 17 Mar 2019 23:04:30 +0000 Subject: [PATCH] Annotation Test changes diff --git a/src/test/java/org/bukkit/AnnotationTest.java b/src/test/java/org/bukkit/AnnotationTest.java -index cc6b6e20..328a5a16 100644 +index cc6b6e209..328a5a163 100644 --- a/src/test/java/org/bukkit/AnnotationTest.java +++ b/src/test/java/org/bukkit/AnnotationTest.java @@ -40,7 +40,17 @@ public class AnnotationTest { diff --git a/Spigot-API-Patches/0174-Entity-getEntitySpawnReason.patch b/Spigot-API-Patches/0174-Entity-getEntitySpawnReason.patch index ca797a0fd4..a45246ff00 100644 --- a/Spigot-API-Patches/0174-Entity-getEntitySpawnReason.patch +++ b/Spigot-API-Patches/0174-Entity-getEntitySpawnReason.patch @@ -1,4 +1,4 @@ -From 6eb4f8f6f02a2a720d97c5925953c48b247674eb Mon Sep 17 00:00:00 2001 +From c59533416e4ba67fd10f4adc708b47a86db78a8a Mon Sep 17 00:00:00 2001 From: Aikar Date: Sun, 24 Mar 2019 00:21:23 -0400 Subject: [PATCH] Entity#getEntitySpawnReason @@ -10,7 +10,7 @@ persistenting Living Entity, SPAWNER for spawners, or DEFAULT since data was not stored. diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java -index f41243f9..29229c64 100644 +index f41243f92..29229c646 100644 --- a/src/main/java/org/bukkit/entity/Entity.java +++ b/src/main/java/org/bukkit/entity/Entity.java @@ -657,5 +657,11 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent diff --git a/Spigot-API-Patches/0175-Add-GS4-Query-event.patch b/Spigot-API-Patches/0175-Add-GS4-Query-event.patch index 788a484175..fcb2aeaad4 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 aee94b65e9c32b8d84ff9a1aabf73be285ebcfc0 Mon Sep 17 00:00:00 2001 +From 59eacbbb4ec704e6ef3cccfdee4d1e378c92cd36 Mon Sep 17 00:00:00 2001 From: Mark Vainomaa Date: Sun, 17 Mar 2019 21:46:27 +0200 Subject: [PATCH] Add GS4 Query event @@ -6,7 +6,7 @@ Subject: [PATCH] Add GS4 Query event diff --git a/src/main/java/com/destroystokyo/paper/event/server/GS4QueryEvent.java b/src/main/java/com/destroystokyo/paper/event/server/GS4QueryEvent.java new file mode 100644 -index 00000000..77a19995 +index 000000000..77a19995f --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/event/server/GS4QueryEvent.java @@ -0,0 +1,412 @@ diff --git a/Spigot-API-Patches/0176-Add-PlayerPostRespawnEvent.patch b/Spigot-API-Patches/0176-Add-PlayerPostRespawnEvent.patch index 79e07b3a24..c21fd99f98 100644 --- a/Spigot-API-Patches/0176-Add-PlayerPostRespawnEvent.patch +++ b/Spigot-API-Patches/0176-Add-PlayerPostRespawnEvent.patch @@ -1,4 +1,4 @@ -From f38ffb6d09efb22ea0368e835ed6c4c0fec23773 Mon Sep 17 00:00:00 2001 +From 8d60815a41792883adc91e738508154acf6b760f Mon Sep 17 00:00:00 2001 From: MisterVector Date: Fri, 26 Oct 2018 21:33:13 -0700 Subject: [PATCH] Add PlayerPostRespawnEvent @@ -6,7 +6,7 @@ Subject: [PATCH] Add PlayerPostRespawnEvent diff --git a/src/main/java/com/destroystokyo/paper/event/player/PlayerPostRespawnEvent.java b/src/main/java/com/destroystokyo/paper/event/player/PlayerPostRespawnEvent.java new file mode 100644 -index 00000000..31f34b54 +index 000000000..31f34b548 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/event/player/PlayerPostRespawnEvent.java @@ -0,0 +1,52 @@ 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 e4383f544d..7c105b95b3 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 2927db66363b3ee30a315fd4041bf5a55b2af016 Mon Sep 17 00:00:00 2001 +From 7a4b5611f41c92ac7d21f8f4de7ac7421205e33c Mon Sep 17 00:00:00 2001 From: Aikar Date: Sun, 24 Mar 2019 18:44:26 -0400 Subject: [PATCH] Ignore package-private methods for nullability annotations @@ -6,7 +6,7 @@ Subject: [PATCH] Ignore package-private methods for nullability annotations This isn't API diff --git a/src/test/java/org/bukkit/AnnotationTest.java b/src/test/java/org/bukkit/AnnotationTest.java -index 328a5a16..af2abd47 100644 +index 328a5a163..af2abd47f 100644 --- a/src/test/java/org/bukkit/AnnotationTest.java +++ b/src/test/java/org/bukkit/AnnotationTest.java @@ -162,7 +162,7 @@ public class AnnotationTest { 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 d20fc827f3..3cff6ae167 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 fb262f912ed78da8575b03f61868f43dd5d63550 Mon Sep 17 00:00:00 2001 +From f959b5099c49597d5e74cfc5f5664a63fbc5718d Mon Sep 17 00:00:00 2001 From: Aikar Date: Sun, 24 Mar 2019 18:39:01 -0400 Subject: [PATCH] Flip some Spigot API null annotations @@ -9,7 +9,7 @@ a ton of noise to plugin developers. These do not help plugin developers if they bring moise noise than value. diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java -index 2148a3c2..6db69159 100644 +index 2148a3c26..6db691591 100644 --- a/src/main/java/org/bukkit/Bukkit.java +++ b/src/main/java/org/bukkit/Bukkit.java @@ -1153,7 +1153,7 @@ public final class Bukkit { @@ -31,7 +31,7 @@ index 2148a3c2..6db69159 100644 return server.getTag(registry, tag, clazz); } diff --git a/src/main/java/org/bukkit/Location.java b/src/main/java/org/bukkit/Location.java -index 4e69f277..2a40da99 100644 +index 4e69f277b..2a40da99f 100644 --- a/src/main/java/org/bukkit/Location.java +++ b/src/main/java/org/bukkit/Location.java @@ -46,7 +46,7 @@ public class Location implements Cloneable, ConfigurationSerializable { @@ -62,7 +62,7 @@ index 4e69f277..2a40da99 100644 if (this.world == null) { return null; diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java -index 1cbb9bc6..27d3b5ad 100644 +index 1cbb9bc66..27d3b5ad7 100644 --- a/src/main/java/org/bukkit/Server.java +++ b/src/main/java/org/bukkit/Server.java @@ -962,7 +962,7 @@ public interface Server extends PluginMessageRecipient { @@ -84,7 +84,7 @@ index 1cbb9bc6..27d3b5ad 100644 /** diff --git a/src/main/java/org/bukkit/inventory/ItemFactory.java b/src/main/java/org/bukkit/inventory/ItemFactory.java -index 3cada348..03ba2265 100644 +index 3cada3487..03ba22659 100644 --- a/src/main/java/org/bukkit/inventory/ItemFactory.java +++ b/src/main/java/org/bukkit/inventory/ItemFactory.java @@ -3,6 +3,7 @@ package org.bukkit.inventory; @@ -105,7 +105,7 @@ index 3cada348..03ba2265 100644 /** diff --git a/src/main/java/org/bukkit/inventory/ItemStack.java b/src/main/java/org/bukkit/inventory/ItemStack.java -index 6d18de76..495161f6 100644 +index 6d18de762..495161f62 100644 --- a/src/main/java/org/bukkit/inventory/ItemStack.java +++ b/src/main/java/org/bukkit/inventory/ItemStack.java @@ -8,6 +8,7 @@ import java.util.Set; // Paper diff --git a/Spigot-API-Patches/0179-Server-Tick-Events.patch b/Spigot-API-Patches/0179-Server-Tick-Events.patch index 4475653ba4..1ef65c7ba8 100644 --- a/Spigot-API-Patches/0179-Server-Tick-Events.patch +++ b/Spigot-API-Patches/0179-Server-Tick-Events.patch @@ -1,4 +1,4 @@ -From 5490eac320d59394f00403eec705cbe774f2fd79 Mon Sep 17 00:00:00 2001 +From 4d2e6bdbe78395769522d953830998f898c35af0 Mon Sep 17 00:00:00 2001 From: Aikar Date: Wed, 27 Mar 2019 21:58:55 -0400 Subject: [PATCH] Server Tick Events @@ -7,7 +7,7 @@ Fires event at start and end of a server tick diff --git a/src/main/java/com/destroystokyo/paper/event/server/ServerTickEndEvent.java b/src/main/java/com/destroystokyo/paper/event/server/ServerTickEndEvent.java new file mode 100644 -index 00000000..9fd28e03 +index 000000000..9fd28e036 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/event/server/ServerTickEndEvent.java @@ -0,0 +1,59 @@ @@ -72,7 +72,7 @@ index 00000000..9fd28e03 +} diff --git a/src/main/java/com/destroystokyo/paper/event/server/ServerTickStartEvent.java b/src/main/java/com/destroystokyo/paper/event/server/ServerTickStartEvent.java new file mode 100644 -index 00000000..eac85f1f +index 000000000..eac85f1f4 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/event/server/ServerTickStartEvent.java @@ -0,0 +1,32 @@ diff --git a/Spigot-API-Patches/0180-PlayerDeathEvent-getItemsToKeep.patch b/Spigot-API-Patches/0180-PlayerDeathEvent-getItemsToKeep.patch index 1806b5ca81..d2e9d38b61 100644 --- a/Spigot-API-Patches/0180-PlayerDeathEvent-getItemsToKeep.patch +++ b/Spigot-API-Patches/0180-PlayerDeathEvent-getItemsToKeep.patch @@ -1,4 +1,4 @@ -From c9d19322171cba500160f8fd9c4373f854f3805c Mon Sep 17 00:00:00 2001 +From 0302a25e88ffc1631e1d28d93d98833b7d0fc483 Mon Sep 17 00:00:00 2001 From: Aikar Date: Mon, 11 Mar 2013 20:04:34 -0400 Subject: [PATCH] PlayerDeathEvent#getItemsToKeep @@ -8,7 +8,7 @@ Exposes a mutable array on items a player should keep on death Example Usage: https://gist.github.com/aikar/5bb202de6057a051a950ce1f29feb0b4 diff --git a/src/main/java/org/bukkit/event/entity/PlayerDeathEvent.java b/src/main/java/org/bukkit/event/entity/PlayerDeathEvent.java -index f0dda632..f5c3c5e2 100644 +index f0dda632d..f5c3c5e24 100644 --- a/src/main/java/org/bukkit/event/entity/PlayerDeathEvent.java +++ b/src/main/java/org/bukkit/event/entity/PlayerDeathEvent.java @@ -17,6 +17,40 @@ public class PlayerDeathEvent extends EntityDeathEvent { diff --git a/Spigot-API-Patches/0181-Add-Heightmap-API.patch b/Spigot-API-Patches/0181-Add-Heightmap-API.patch index d748ec6ab2..eba6680214 100644 --- a/Spigot-API-Patches/0181-Add-Heightmap-API.patch +++ b/Spigot-API-Patches/0181-Add-Heightmap-API.patch @@ -1,4 +1,4 @@ -From 30b569ca7446323f70c2582de9d0c3998d09ed2e Mon Sep 17 00:00:00 2001 +From 1b7353ee69e534a8c4385b9cfc788ffb93f47709 Mon Sep 17 00:00:00 2001 From: Spottedleaf Date: Sat, 1 Dec 2018 19:00:36 -0800 Subject: [PATCH] Add Heightmap API @@ -6,7 +6,7 @@ Subject: [PATCH] Add Heightmap API diff --git a/src/main/java/com/destroystokyo/paper/HeightmapType.java b/src/main/java/com/destroystokyo/paper/HeightmapType.java new file mode 100644 -index 00000000..4cd9b5ed +index 000000000..4cd9b5ed0 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/HeightmapType.java @@ -0,0 +1,35 @@ @@ -46,7 +46,7 @@ index 00000000..4cd9b5ed + SOLID_OR_LIQUID_NO_LEAVES; +} diff --git a/src/main/java/org/bukkit/Location.java b/src/main/java/org/bukkit/Location.java -index 2a40da99..3e1ca4c9 100644 +index 2a40da99f..3e1ca4c9f 100644 --- a/src/main/java/org/bukkit/Location.java +++ b/src/main/java/org/bukkit/Location.java @@ -638,6 +638,33 @@ public class Location implements Cloneable, ConfigurationSerializable { @@ -84,7 +84,7 @@ index 2a40da99..3e1ca4c9 100644 * Creates explosion at this location with given power * diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java -index 1818e158..65dc8022 100644 +index 1818e158f..65dc80229 100644 --- a/src/main/java/org/bukkit/World.java +++ b/src/main/java/org/bukkit/World.java @@ -161,6 +161,79 @@ public interface World extends PluginMessageRecipient, Metadatable { diff --git a/Spigot-API-Patches/0182-Mob-Spawner-API-Enhancements.patch b/Spigot-API-Patches/0182-Mob-Spawner-API-Enhancements.patch index 4e7bf951ae..2fdf346e7f 100644 --- a/Spigot-API-Patches/0182-Mob-Spawner-API-Enhancements.patch +++ b/Spigot-API-Patches/0182-Mob-Spawner-API-Enhancements.patch @@ -1,11 +1,11 @@ -From 9c1b7b7e74dce4fb6fbbd9e3979f9cd711e38141 Mon Sep 17 00:00:00 2001 +From 3c3cebefc31ab279e33340427675319f8a589092 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 diff --git a/src/main/java/org/bukkit/block/CreatureSpawner.java b/src/main/java/org/bukkit/block/CreatureSpawner.java -index e73fb0ef..2ff0f24d 100644 +index e73fb0ef0..2ff0f24d5 100644 --- a/src/main/java/org/bukkit/block/CreatureSpawner.java +++ b/src/main/java/org/bukkit/block/CreatureSpawner.java @@ -199,4 +199,18 @@ public interface CreatureSpawner extends TileState { diff --git a/Spigot-API-Patches/0183-Add-BlockSoundGroup-interface.patch b/Spigot-API-Patches/0183-Add-BlockSoundGroup-interface.patch index 5495cf7c69..f8f7713ee5 100644 --- a/Spigot-API-Patches/0183-Add-BlockSoundGroup-interface.patch +++ b/Spigot-API-Patches/0183-Add-BlockSoundGroup-interface.patch @@ -1,4 +1,4 @@ -From 3d438aa9d1116637c19b621a1c35bdd28ac3d673 Mon Sep 17 00:00:00 2001 +From 11346b317e62ea011e32aa422904088fc687cc3c Mon Sep 17 00:00:00 2001 From: simpleauthority Date: Tue, 28 May 2019 03:41:28 -0700 Subject: [PATCH] Add BlockSoundGroup interface @@ -7,7 +7,7 @@ This PR adds the getSoundGroup() method in Block which returns a BlockSoundGroup diff --git a/src/main/java/com/destroystokyo/paper/block/BlockSoundGroup.java b/src/main/java/com/destroystokyo/paper/block/BlockSoundGroup.java new file mode 100644 -index 00000000..8cf87d22 +index 000000000..8cf87d228 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/block/BlockSoundGroup.java @@ -0,0 +1,52 @@ @@ -64,7 +64,7 @@ index 00000000..8cf87d22 + Sound getFallSound(); +} diff --git a/src/main/java/org/bukkit/block/Block.java b/src/main/java/org/bukkit/block/Block.java -index 87185a81..038de5a6 100644 +index 87185a812..038de5a64 100644 --- a/src/main/java/org/bukkit/block/Block.java +++ b/src/main/java/org/bukkit/block/Block.java @@ -1,6 +1,7 @@ @@ -93,5 +93,5 @@ index 87185a81..038de5a6 100644 + // Paper end } -- -2.19.2 +2.21.0 diff --git a/Spigot-Server-Patches/0001-POM-Changes.patch b/Spigot-Server-Patches/0001-POM-Changes.patch index 727b0b458c..255d1ab29f 100644 --- a/Spigot-Server-Patches/0001-POM-Changes.patch +++ b/Spigot-Server-Patches/0001-POM-Changes.patch @@ -1,4 +1,4 @@ -From a96c56c3980dd2a55c41139b1033fae3a8aaaeca Mon Sep 17 00:00:00 2001 +From cbc8dcc19ea14ca07e407ba379ca587ef78ce8e7 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 c22f4771fe..33ed4168fc 100644 --- a/Spigot-Server-Patches/0002-Paper-config-files.patch +++ b/Spigot-Server-Patches/0002-Paper-config-files.patch @@ -1,4 +1,4 @@ -From d4985c027b143f266a5f6aed5f3786189b01d347 Mon Sep 17 00:00:00 2001 +From 6c5ccc94bb844b84e7d9ad39caeace51262c7b81 Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Mon, 29 Feb 2016 21:02:09 -0600 Subject: [PATCH] Paper config files @@ -6,7 +6,7 @@ Subject: [PATCH] Paper config files diff --git a/src/main/java/com/destroystokyo/paper/PaperCommand.java b/src/main/java/com/destroystokyo/paper/PaperCommand.java new file mode 100644 -index 000000000..b5f318c00 +index 0000000000..b5f318c00d --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/PaperCommand.java @@ -0,0 +1,241 @@ @@ -253,7 +253,7 @@ index 000000000..b5f318c00 +} diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java new file mode 100644 -index 000000000..db79fe41b +index 0000000000..db79fe41b9 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java @@ -0,0 +1,184 @@ @@ -443,7 +443,7 @@ index 000000000..db79fe41b +} diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java new file mode 100644 -index 000000000..a73865739 +index 0000000000..a738657394 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java @@ -0,0 +1,67 @@ @@ -515,7 +515,7 @@ index 000000000..a73865739 + } +} diff --git a/src/main/java/net/minecraft/server/DedicatedServer.java b/src/main/java/net/minecraft/server/DedicatedServer.java -index e1ba833f3..b60956218 100644 +index e1ba833f3e..b60956218d 100644 --- a/src/main/java/net/minecraft/server/DedicatedServer.java +++ b/src/main/java/net/minecraft/server/DedicatedServer.java @@ -152,6 +152,15 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer @@ -535,7 +535,7 @@ index e1ba833f3..b60956218 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 36e42f900..8371631db 100644 +index 3495d8ecdc..45e2ce618a 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java @@ -134,9 +134,9 @@ public abstract class Entity implements INamableTileEntity, ICommandListener { @@ -552,7 +552,7 @@ index 36e42f900..8371631db 100644 public boolean impulse; public int portalCooldown; diff --git a/src/main/java/net/minecraft/server/EntityTypes.java b/src/main/java/net/minecraft/server/EntityTypes.java -index 659e0ea50..8c918d0d6 100644 +index 659e0ea50a..8c918d0d68 100644 --- a/src/main/java/net/minecraft/server/EntityTypes.java +++ b/src/main/java/net/minecraft/server/EntityTypes.java @@ -4,6 +4,7 @@ import com.mojang.datafixers.DataFixUtils; @@ -575,7 +575,7 @@ index 659e0ea50..8c918d0d6 100644 + // Paper end } diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index cc3f201c9..923d8e28e 100644 +index a8ac7be82b..91e50ccea1 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -86,6 +86,8 @@ public abstract class World implements IIBlockAccess, GeneratorAccess, AutoClose @@ -596,7 +596,7 @@ index cc3f201c9..923d8e28e 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 3edc623a7..7fe76b8d5 100644 +index 95deac5b97..4413066eea 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -751,6 +751,7 @@ public final class CraftServer implements Server { @@ -651,7 +651,7 @@ index 3edc623a7..7fe76b8d5 100644 + // Paper end } diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java -index e17d91418..f406464ef 100644 +index e17d914185..f406464ef8 100644 --- a/src/main/java/org/bukkit/craftbukkit/Main.java +++ b/src/main/java/org/bukkit/craftbukkit/Main.java @@ -128,6 +128,14 @@ public class Main { @@ -670,7 +670,7 @@ index e17d91418..f406464ef 100644 }; diff --git a/src/main/java/org/spigotmc/SpigotWorldConfig.java b/src/main/java/org/spigotmc/SpigotWorldConfig.java -index 6bceeb120..9a51c0ef7 100644 +index 3949e659e8..7f0adb70d1 100644 --- a/src/main/java/org/spigotmc/SpigotWorldConfig.java +++ b/src/main/java/org/spigotmc/SpigotWorldConfig.java @@ -39,36 +39,36 @@ public class SpigotWorldConfig diff --git a/Spigot-Server-Patches/0003-MC-Dev-fixes.patch b/Spigot-Server-Patches/0003-MC-Dev-fixes.patch index 5159b04579..27de577994 100644 --- a/Spigot-Server-Patches/0003-MC-Dev-fixes.patch +++ b/Spigot-Server-Patches/0003-MC-Dev-fixes.patch @@ -1,4 +1,4 @@ -From ea6a8d7b47481375de1dc77526210e0791927114 Mon Sep 17 00:00:00 2001 +From 5dde5436fce04b97a2a80a307281f2573007b7b6 Mon Sep 17 00:00:00 2001 From: Aikar Date: Wed, 30 Mar 2016 19:36:20 -0400 Subject: [PATCH] MC Dev fixes @@ -161,7 +161,7 @@ index c973ab6076..30701fd7f3 100644 } } diff --git a/src/main/java/net/minecraft/server/EntityFox.java b/src/main/java/net/minecraft/server/EntityFox.java -index 0e6626096b..85b32a8ac9 100644 +index 8c7b5a7dba..85202abbc9 100644 --- a/src/main/java/net/minecraft/server/EntityFox.java +++ b/src/main/java/net/minecraft/server/EntityFox.java @@ -97,7 +97,7 @@ public class EntityFox extends EntityAnimal { diff --git a/Spigot-Server-Patches/0004-MC-Utils.patch b/Spigot-Server-Patches/0004-MC-Utils.patch index a56d12198d..b2a94a15ae 100644 --- a/Spigot-Server-Patches/0004-MC-Utils.patch +++ b/Spigot-Server-Patches/0004-MC-Utils.patch @@ -1,4 +1,4 @@ -From 455709eb3fa018d50a6fea993e346ae69f8a05ed Mon Sep 17 00:00:00 2001 +From 412fe7b001625806a64ebd7a3dea1f662c325b17 Mon Sep 17 00:00:00 2001 From: Aikar Date: Mon, 28 Mar 2016 20:55:47 -0400 Subject: [PATCH] MC Utils @@ -55,7 +55,7 @@ index b370316574..841c7d1904 100644 return this.d.containsKey(iblockstate); } diff --git a/src/main/java/net/minecraft/server/BlockPosition.java b/src/main/java/net/minecraft/server/BlockPosition.java -index dd47e9cbe4..c927d524a8 100644 +index 70d9342422..b56a044b3a 100644 --- a/src/main/java/net/minecraft/server/BlockPosition.java +++ b/src/main/java/net/minecraft/server/BlockPosition.java @@ -120,6 +120,7 @@ public class BlockPosition extends BaseBlockPosition implements MinecraftSeriali @@ -92,7 +92,7 @@ index dd47e9cbe4..c927d524a8 100644 return this.d(MathHelper.floor(d0), MathHelper.floor(d1), MathHelper.floor(d2)); } diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java -index ca73bfbd83..2cbae8230f 100644 +index bdda2e63ae..0905fbdc41 100644 --- a/src/main/java/net/minecraft/server/Chunk.java +++ b/src/main/java/net/minecraft/server/Chunk.java @@ -25,7 +25,7 @@ import org.apache.logging.log4j.Logger; @@ -266,7 +266,7 @@ index 4f69e23271..8f5f61f602 100644 super(entitytypes, world); } diff --git a/src/main/java/net/minecraft/server/EntityInsentient.java b/src/main/java/net/minecraft/server/EntityInsentient.java -index 0ca7cd31f4..113532a97b 100644 +index d4fff5b72e..ec1da887c6 100644 --- a/src/main/java/net/minecraft/server/EntityInsentient.java +++ b/src/main/java/net/minecraft/server/EntityInsentient.java @@ -143,6 +143,7 @@ public abstract class EntityInsentient extends EntityLiving { @@ -278,7 +278,7 @@ index 0ca7cd31f4..113532a97b 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 bd515c6264..d5ffa9f0f7 100644 +index 61319d6c20..40173aa35b 100644 --- a/src/main/java/net/minecraft/server/EntityLiving.java +++ b/src/main/java/net/minecraft/server/EntityLiving.java @@ -126,6 +126,7 @@ public abstract class EntityLiving extends Entity { @@ -374,7 +374,7 @@ index 6e365f402c..577b227758 100644 return this.getType(blockposition).h(); } diff --git a/src/main/java/net/minecraft/server/IWorldReader.java b/src/main/java/net/minecraft/server/IWorldReader.java -index 9a98fb4af5..17dac8dfa4 100644 +index 729bac3ab5..7308c0c319 100644 --- a/src/main/java/net/minecraft/server/IWorldReader.java +++ b/src/main/java/net/minecraft/server/IWorldReader.java @@ -39,6 +39,7 @@ public interface IWorldReader extends IIBlockAccess { @@ -796,7 +796,7 @@ index e16a579b55..3f6d2676e7 100644 return new UUID(this.getLong(s + "Most"), this.getLong(s + "Least")); } diff --git a/src/main/java/net/minecraft/server/NetworkManager.java b/src/main/java/net/minecraft/server/NetworkManager.java -index fe6854d0e4..2db7229e91 100644 +index 1c32e6ef47..d4c59baf8f 100644 --- a/src/main/java/net/minecraft/server/NetworkManager.java +++ b/src/main/java/net/minecraft/server/NetworkManager.java @@ -43,7 +43,7 @@ public class NetworkManager extends SimpleChannelInboundHandler> { @@ -882,7 +882,7 @@ index 4e20cfba41..363ab5da12 100644 int j = 0; ChunkSection[] achunksection = chunk.getSections(); diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java -index 68926d0de6..5757dd6fb3 100644 +index 58f9946455..ae194b981f 100644 --- a/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java @@ -67,9 +67,9 @@ public class PlayerConnection implements PacketListenerPlayIn { @@ -924,7 +924,7 @@ index b3824898da..bf4172be52 100644 MinecraftKey minecraftkey = IRegistry.POTION.getKey(potionregistry); diff --git a/src/main/java/net/minecraft/server/ProtoChunk.java b/src/main/java/net/minecraft/server/ProtoChunk.java -index 6296611f19..807bd68485 100644 +index 2158e239e0..6bdd7dda04 100644 --- a/src/main/java/net/minecraft/server/ProtoChunk.java +++ b/src/main/java/net/minecraft/server/ProtoChunk.java @@ -79,6 +79,18 @@ public class ProtoChunk implements IChunkAccess { @@ -1003,7 +1003,7 @@ index b3799ab564..5fae5a1233 100644 public static long getTimeMillis() { diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index 923d8e28e7..541fc0cf94 100644 +index 91e50ccea1..69c704a429 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -210,6 +210,44 @@ public abstract class World implements IIBlockAccess, GeneratorAccess, AutoClose diff --git a/Spigot-Server-Patches/0005-Paper-Metrics.patch b/Spigot-Server-Patches/0005-Paper-Metrics.patch index ca244b750f..0bc5845233 100644 --- a/Spigot-Server-Patches/0005-Paper-Metrics.patch +++ b/Spigot-Server-Patches/0005-Paper-Metrics.patch @@ -1,4 +1,4 @@ -From 1b20e74bcb7f3a0073b7faeef1c3fb26ca3209f7 Mon Sep 17 00:00:00 2001 +From 45ca88f6a5f999255277f7038a7f3cd12b11d774 Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Fri, 24 Mar 2017 23:56:01 -0500 Subject: [PATCH] Paper Metrics @@ -671,7 +671,7 @@ index db79fe41b9..5518ec1e54 100644 static void readConfig(Class clazz, Object instance) { diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java -index 11c4d53dfa..fe3bad5830 100644 +index a7a47b1f32..fc6cb9306a 100644 --- a/src/main/java/org/spigotmc/SpigotConfig.java +++ b/src/main/java/org/spigotmc/SpigotConfig.java @@ -83,6 +83,7 @@ public class SpigotConfig 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 c2186eb6e0..e333bac7f7 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 1f5d2fdb86b5f80245f453099885feb063f1af22 Mon Sep 17 00:00:00 2001 +From 2e81d186103a7ae4d41a731f9c8e3dc06db32e4d 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 b5f318c00d..ce190d88d6 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 ed4253a490..84ba4798f7 100644 +index 45e2ce618a..7af4771681 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; @@ -92,7 +92,7 @@ index 0000000000..743142d030 + } +} diff --git a/src/main/java/net/minecraft/server/TileEntity.java b/src/main/java/net/minecraft/server/TileEntity.java -index 8d868d84ca..b511fe263f 100644 +index fa6ec71061..4ccdd7583e 100644 --- a/src/main/java/net/minecraft/server/TileEntity.java +++ b/src/main/java/net/minecraft/server/TileEntity.java @@ -11,7 +11,7 @@ import org.bukkit.inventory.InventoryHolder; 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 a4eabf8635..e2663dbfed 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 81c056ba360b52b5661c92d34a72d15812efa9ad Mon Sep 17 00:00:00 2001 +From b790a858c844eea2b796501289688497ec0564cc 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 @@ -8,7 +8,7 @@ This enables us a fast reference to the entities current chunk instead of having to look it up by hashmap lookups. diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java -index 2cbae8230f..4d1326efb4 100644 +index 0905fbdc41..dbe7e5c013 100644 --- a/src/main/java/net/minecraft/server/Chunk.java +++ b/src/main/java/net/minecraft/server/Chunk.java @@ -29,7 +29,7 @@ public class Chunk implements IChunkAccess { @@ -90,7 +90,7 @@ index 2cbae8230f..4d1326efb4 100644 @Override diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java -index 84ba4798f7..8936bbbeef 100644 +index 7af4771681..708f6c97c6 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java @@ -133,7 +133,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke @@ -143,7 +143,7 @@ index 84ba4798f7..8936bbbeef 100644 private String entityKeyString; diff --git a/src/main/java/net/minecraft/server/TileEntity.java b/src/main/java/net/minecraft/server/TileEntity.java -index b511fe263f..7546f6690b 100644 +index 4ccdd7583e..382498d193 100644 --- a/src/main/java/net/minecraft/server/TileEntity.java +++ b/src/main/java/net/minecraft/server/TileEntity.java @@ -51,6 +51,15 @@ public abstract class TileEntity implements KeyedObject { // Paper 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 0916e85e9e..40a6e74058 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 d575c325a1b4d90238df8f470c66830ecf154ad6 Mon Sep 17 00:00:00 2001 +From e26a58115bcc9e0dff988483c196febe03a31d25 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 4d1326efb4..787490faac 100644 +index dbe7e5c013..8075cc4827 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 { diff --git a/Spigot-Server-Patches/0009-Timings-v2.patch b/Spigot-Server-Patches/0009-Timings-v2.patch index 5713173bd7..b9f8781fa0 100644 --- a/Spigot-Server-Patches/0009-Timings-v2.patch +++ b/Spigot-Server-Patches/0009-Timings-v2.patch @@ -1,4 +1,4 @@ -From 6c5300f5e220776d2f6e96245979d2f44ea13c04 Mon Sep 17 00:00:00 2001 +From 17e30b085ba6cdf25c0e1efbc95adb66324eda59 Mon Sep 17 00:00:00 2001 From: Aikar Date: Thu, 3 Mar 2016 04:00:11 -0600 Subject: [PATCH] Timings v2 @@ -6,7 +6,7 @@ Subject: [PATCH] Timings v2 diff --git a/src/main/java/co/aikar/timings/MinecraftTimings.java b/src/main/java/co/aikar/timings/MinecraftTimings.java new file mode 100644 -index 000000000..3f9fb6f90 +index 0000000000..3f9fb6f906 --- /dev/null +++ b/src/main/java/co/aikar/timings/MinecraftTimings.java @@ -0,0 +1,133 @@ @@ -145,7 +145,7 @@ index 000000000..3f9fb6f90 +} diff --git a/src/main/java/co/aikar/timings/WorldTimingsHandler.java b/src/main/java/co/aikar/timings/WorldTimingsHandler.java new file mode 100644 -index 000000000..d5d3b2a20 +index 0000000000..d5d3b2a20c --- /dev/null +++ b/src/main/java/co/aikar/timings/WorldTimingsHandler.java @@ -0,0 +1,105 @@ @@ -255,7 +255,7 @@ index 000000000..d5d3b2a20 + } +} diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java -index 5518ec1e5..0c65afccf 100644 +index 5518ec1e54..0c65afccfd 100644 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java @@ -14,11 +14,14 @@ import java.util.concurrent.TimeUnit; @@ -302,7 +302,7 @@ index 5518ec1e5..0c65afccf 100644 + } } diff --git a/src/main/java/net/minecraft/server/Block.java b/src/main/java/net/minecraft/server/Block.java -index b2e5bcf57..78b0e7847 100644 +index b2e5bcf57c..78b0e78474 100644 --- a/src/main/java/net/minecraft/server/Block.java +++ b/src/main/java/net/minecraft/server/Block.java @@ -31,6 +31,15 @@ public class Block implements IMaterial { @@ -322,7 +322,7 @@ index b2e5bcf57..78b0e7847 100644 private final float frictionFactor; protected final BlockStateList blockStateList; diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java -index 8075cc482..3de0f6975 100644 +index 8075cc4827..3de0f69758 100644 --- a/src/main/java/net/minecraft/server/Chunk.java +++ b/src/main/java/net/minecraft/server/Chunk.java @@ -573,6 +573,7 @@ public class Chunk implements IChunkAccess { @@ -342,7 +342,7 @@ index 8075cc482..3de0f6975 100644 } } diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java -index ea142d76a..cc7556d93 100644 +index dcf2d38df5..2933439ba1 100644 --- a/src/main/java/net/minecraft/server/ChunkProviderServer.java +++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java @@ -245,7 +245,9 @@ public class ChunkProviderServer extends IChunkProvider { @@ -378,7 +378,7 @@ index ea142d76a..cc7556d93 100644 @Override diff --git a/src/main/java/net/minecraft/server/ChunkRegionLoader.java b/src/main/java/net/minecraft/server/ChunkRegionLoader.java -index 2e09900f4..1ebb16f0f 100644 +index 2e09900f45..1ebb16f0f6 100644 --- a/src/main/java/net/minecraft/server/ChunkRegionLoader.java +++ b/src/main/java/net/minecraft/server/ChunkRegionLoader.java @@ -1,5 +1,6 @@ @@ -416,7 +416,7 @@ index 2e09900f4..1ebb16f0f 100644 } diff --git a/src/main/java/net/minecraft/server/CustomFunction.java b/src/main/java/net/minecraft/server/CustomFunction.java -index 46e7737ca..a3ef94306 100644 +index 46e7737ca3..a3ef943066 100644 --- a/src/main/java/net/minecraft/server/CustomFunction.java +++ b/src/main/java/net/minecraft/server/CustomFunction.java @@ -13,12 +13,22 @@ public class CustomFunction { @@ -443,7 +443,7 @@ index 46e7737ca..a3ef94306 100644 return this.b; } diff --git a/src/main/java/net/minecraft/server/CustomFunctionData.java b/src/main/java/net/minecraft/server/CustomFunctionData.java -index 9c9eef0ad..b42fbf2c6 100644 +index 9c9eef0ad9..b42fbf2c65 100644 --- a/src/main/java/net/minecraft/server/CustomFunctionData.java +++ b/src/main/java/net/minecraft/server/CustomFunctionData.java @@ -101,7 +101,7 @@ public class CustomFunctionData implements IResourcePackListener { @@ -456,7 +456,7 @@ index 9c9eef0ad..b42fbf2c6 100644 int j = 0; CustomFunction.c[] acustomfunction_c = customfunction.b(); diff --git a/src/main/java/net/minecraft/server/DedicatedServer.java b/src/main/java/net/minecraft/server/DedicatedServer.java -index b60956218..19e2df309 100644 +index b60956218d..19e2df3098 100644 --- a/src/main/java/net/minecraft/server/DedicatedServer.java +++ b/src/main/java/net/minecraft/server/DedicatedServer.java @@ -31,7 +31,7 @@ import org.apache.logging.log4j.Level; @@ -509,7 +509,7 @@ index b60956218..19e2df309 100644 return waitable.get(); } catch (java.util.concurrent.ExecutionException e) { diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java -index 4afee193c..3819f8d2e 100644 +index 708f6c97c6..c348d6bec3 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java @@ -29,7 +29,8 @@ import org.bukkit.command.CommandSender; @@ -548,7 +548,7 @@ index 4afee193c..3819f8d2e 100644 protected Vec3D a(Vec3D vec3d, EnumMoveType enummovetype) { diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java -index cca9da174..4830c0bd7 100644 +index 40173aa35b..678dae6dae 100644 --- a/src/main/java/net/minecraft/server/EntityLiving.java +++ b/src/main/java/net/minecraft/server/EntityLiving.java @@ -35,7 +35,7 @@ import org.bukkit.event.entity.EntityTeleportEvent; @@ -624,7 +624,7 @@ index cca9da174..4830c0bd7 100644 } diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 64318e6e7..c76620f2b 100644 +index 64318e6e78..c76620f2b3 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -1,5 +1,7 @@ @@ -752,7 +752,7 @@ index 64318e6e7..c76620f2b 100644 this.methodProfiler.exit(); } diff --git a/src/main/java/net/minecraft/server/PlayerChunkMap.java b/src/main/java/net/minecraft/server/PlayerChunkMap.java -index ceb2eba78..d6020c677 100644 +index 3d2436365f..db159baab2 100644 --- a/src/main/java/net/minecraft/server/PlayerChunkMap.java +++ b/src/main/java/net/minecraft/server/PlayerChunkMap.java @@ -1,6 +1,8 @@ @@ -799,7 +799,7 @@ index ceb2eba78..d6020c677 100644 } diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java -index ae194b981..d20037bd0 100644 +index ae194b981f..d20037bd00 100644 --- a/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java @@ -58,6 +58,7 @@ import org.bukkit.inventory.CraftingInventory; @@ -854,7 +854,7 @@ index ae194b981..d20037bd0 100644 // this.minecraftServer.getCommandDispatcher().a(this.player.getCommandListener(), s); // CraftBukkit end diff --git a/src/main/java/net/minecraft/server/PlayerConnectionUtils.java b/src/main/java/net/minecraft/server/PlayerConnectionUtils.java -index cb6d50ea7..9ba03f8ed 100644 +index cb6d50ea70..9ba03f8ed0 100644 --- a/src/main/java/net/minecraft/server/PlayerConnectionUtils.java +++ b/src/main/java/net/minecraft/server/PlayerConnectionUtils.java @@ -1,5 +1,8 @@ @@ -880,7 +880,7 @@ index cb6d50ea7..9ba03f8ed 100644 throw CancelledPacketHandleException.INSTANCE; } diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java -index 59752dcd4..1ee1df075 100644 +index 59752dcd47..1ee1df0757 100644 --- a/src/main/java/net/minecraft/server/PlayerList.java +++ b/src/main/java/net/minecraft/server/PlayerList.java @@ -1,5 +1,6 @@ @@ -904,7 +904,7 @@ index 59752dcd4..1ee1df075 100644 public WhiteList getWhitelist() { diff --git a/src/main/java/net/minecraft/server/TickListServer.java b/src/main/java/net/minecraft/server/TickListServer.java -index 061730c56..c5890f5dc 100644 +index 061730c560..c5890f5dcc 100644 --- a/src/main/java/net/minecraft/server/TickListServer.java +++ b/src/main/java/net/minecraft/server/TickListServer.java @@ -28,13 +28,18 @@ public class TickListServer implements TickList { @@ -954,7 +954,7 @@ index 061730c56..c5890f5dc 100644 this.g.clear(); } diff --git a/src/main/java/net/minecraft/server/TileEntity.java b/src/main/java/net/minecraft/server/TileEntity.java -index 382498d19..a833781e5 100644 +index 382498d193..a833781e59 100644 --- a/src/main/java/net/minecraft/server/TileEntity.java +++ b/src/main/java/net/minecraft/server/TileEntity.java @@ -9,11 +9,12 @@ import org.bukkit.craftbukkit.persistence.CraftPersistentDataContainer; @@ -973,7 +973,7 @@ index 382498d19..a833781e5 100644 private static final CraftPersistentDataTypeRegistry DATA_TYPE_REGISTRY = new CraftPersistentDataTypeRegistry(); public final CraftPersistentDataContainer persistentDataContainer = new CraftPersistentDataContainer(DATA_TYPE_REGISTRY); diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index 69c704a42..d7b3b4b8c 100644 +index 69c704a429..d7b3b4b8c8 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -1,5 +1,7 @@ @@ -1040,7 +1040,7 @@ index 69c704a42..d7b3b4b8c 100644 } diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java -index 508cdc6a0..089468835 100644 +index 508cdc6a0c..089468835b 100644 --- a/src/main/java/net/minecraft/server/WorldServer.java +++ b/src/main/java/net/minecraft/server/WorldServer.java @@ -1,5 +1,7 @@ @@ -1132,7 +1132,7 @@ index 508cdc6a0..089468835 100644 } diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 4413066ee..834c16172 100644 +index 4413066eea..834c16172b 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -1926,12 +1926,31 @@ public final class CraftServer implements Server { @@ -1169,7 +1169,7 @@ index 4413066ee..834c16172 100644 org.spigotmc.RestartCommand.restart(); diff --git a/src/main/java/org/bukkit/craftbukkit/SpigotTimings.java b/src/main/java/org/bukkit/craftbukkit/SpigotTimings.java deleted file mode 100644 -index 38f211526..000000000 +index 38f211526b..0000000000 --- a/src/main/java/org/bukkit/craftbukkit/SpigotTimings.java +++ /dev/null @@ -1,166 +0,0 @@ @@ -1340,7 +1340,7 @@ index 38f211526..000000000 - } -} diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index 5b58b1a96..8980de820 100644 +index 5b58b1a96f..8980de8203 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -1728,6 +1728,14 @@ public class CraftPlayer extends CraftHumanEntity implements Player { @@ -1359,7 +1359,7 @@ index 5b58b1a96..8980de820 100644 public Player.Spigot spigot() diff --git a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java -index b90979c7b..8823f94f7 100644 +index b90979c7ba..8823f94f7b 100644 --- a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java +++ b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java @@ -1,5 +1,6 @@ @@ -1425,7 +1425,7 @@ index b90979c7b..8823f94f7 100644 private boolean isReady(final int currentTick) { diff --git a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftTask.java b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftTask.java -index 3f55381c1..0d9a46680 100644 +index 3f55381c15..0d9a466809 100644 --- a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftTask.java +++ b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftTask.java @@ -1,9 +1,11 @@ @@ -1510,7 +1510,7 @@ index 3f55381c1..0d9a46680 100644 - // Spigot end } diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftIconCache.java b/src/main/java/org/bukkit/craftbukkit/util/CraftIconCache.java -index e52ef47b7..3d90b3426 100644 +index e52ef47b78..3d90b34268 100644 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftIconCache.java +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftIconCache.java @@ -5,6 +5,7 @@ import org.bukkit.util.CachedServerIcon; @@ -1522,7 +1522,7 @@ index e52ef47b7..3d90b3426 100644 this.value = value; } diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java -index 328679fba..60a5e7148 100644 +index c88704f69e..f7fdd0727b 100644 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java @@ -271,6 +271,13 @@ public final class CraftMagicNumbers implements UnsafeValues { @@ -1540,7 +1540,7 @@ index 328679fba..60a5e7148 100644 * This helper class represents the different NBT Tags. *

diff --git a/src/main/java/org/spigotmc/ActivationRange.java b/src/main/java/org/spigotmc/ActivationRange.java -index 4c947a935..106e9d7e2 100644 +index 4c947a9352..106e9d7e2d 100644 --- a/src/main/java/org/spigotmc/ActivationRange.java +++ b/src/main/java/org/spigotmc/ActivationRange.java @@ -31,7 +31,7 @@ import net.minecraft.server.EntityWither; 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 5d6d8f1ff6..23bead7e14 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 662d7a5246e03de6fe1d4cd0a5d59943e103859a Mon Sep 17 00:00:00 2001 +From d7e9ba66c7068677b9cdd3ce360b2f3110c3ac77 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 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 1862712f36..f8485c44d5 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 0c5a8cdfb123a2b2f985cbbc6105e593eb35aba1 Mon Sep 17 00:00:00 2001 +From 2d48679f23028dcda35486761522bdf6b848f6a2 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 @@ -20,7 +20,7 @@ index 098bd3fba8..55d8e74f82 100644 + } } diff --git a/src/main/java/net/minecraft/server/EntityZombie.java b/src/main/java/net/minecraft/server/EntityZombie.java -index 21df3ef2c3..c3ce3daca6 100644 +index 9cea262c80..4cb305ff28 100644 --- a/src/main/java/net/minecraft/server/EntityZombie.java +++ b/src/main/java/net/minecraft/server/EntityZombie.java @@ -19,7 +19,7 @@ public class EntityZombie extends EntityMonster { diff --git a/Spigot-Server-Patches/0012-Configurable-fishing-time-ranges.patch b/Spigot-Server-Patches/0012-Configurable-fishing-time-ranges.patch index 21c60e961b..fc2aed5ccf 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 9fe272a81b0d394b409499ce747d5add6da430ca Mon Sep 17 00:00:00 2001 +From d47f4c0dfb58af4d67bc6014f3b2348f89b71e55 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 @@ -22,7 +22,7 @@ index 55d8e74f82..a55163a458 100644 + } } diff --git a/src/main/java/net/minecraft/server/EntityFishingHook.java b/src/main/java/net/minecraft/server/EntityFishingHook.java -index 366356a921..b082d0a820 100644 +index cdcad4c292..19a6233c3f 100644 --- a/src/main/java/net/minecraft/server/EntityFishingHook.java +++ b/src/main/java/net/minecraft/server/EntityFishingHook.java @@ -329,8 +329,9 @@ public class EntityFishingHook extends Entity { diff --git a/Spigot-Server-Patches/0013-Allow-nerfed-mobs-to-jump.patch b/Spigot-Server-Patches/0013-Allow-nerfed-mobs-to-jump.patch index c9a83883e2..3069dc296f 100644 --- a/Spigot-Server-Patches/0013-Allow-nerfed-mobs-to-jump.patch +++ b/Spigot-Server-Patches/0013-Allow-nerfed-mobs-to-jump.patch @@ -1,11 +1,11 @@ -From eca7fb22dcc48a6590945d03ae49a7ea0a348046 Mon Sep 17 00:00:00 2001 +From 24169471d680736ffd62d7c5a2c82fadeabdf791 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 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index a55163a45..341038fc4 100644 +index a55163a458..341038fc4d 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java @@ -87,4 +87,9 @@ public class PaperWorldConfig { @@ -19,7 +19,7 @@ index a55163a45..341038fc4 100644 + } } diff --git a/src/main/java/net/minecraft/server/ControllerJump.java b/src/main/java/net/minecraft/server/ControllerJump.java -index 2e869004c..8a6856e0f 100644 +index 2e869004c8..8a6856e0fd 100644 --- a/src/main/java/net/minecraft/server/ControllerJump.java +++ b/src/main/java/net/minecraft/server/ControllerJump.java @@ -13,6 +13,7 @@ public class ControllerJump { @@ -31,7 +31,7 @@ index 2e869004c..8a6856e0f 100644 this.b.setJumping(this.a); this.a = false; diff --git a/src/main/java/net/minecraft/server/EntityInsentient.java b/src/main/java/net/minecraft/server/EntityInsentient.java -index 113532a97..946e89c49 100644 +index ec1da887c6..679dda76e4 100644 --- a/src/main/java/net/minecraft/server/EntityInsentient.java +++ b/src/main/java/net/minecraft/server/EntityInsentient.java @@ -31,6 +31,7 @@ public abstract class EntityInsentient extends EntityLiving { @@ -56,7 +56,7 @@ index 113532a97..946e89c49 100644 } // Spigot End diff --git a/src/main/java/net/minecraft/server/PathfinderGoalFloat.java b/src/main/java/net/minecraft/server/PathfinderGoalFloat.java -index 040a64471..a10532b0f 100644 +index 040a64471f..a10532b0f8 100644 --- a/src/main/java/net/minecraft/server/PathfinderGoalFloat.java +++ b/src/main/java/net/minecraft/server/PathfinderGoalFloat.java @@ -8,10 +8,12 @@ public class PathfinderGoalFloat extends PathfinderGoal { 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 cac136b570..e2fa220bd0 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,11 +1,11 @@ -From 7218767528ebd0d22a17c1a943fa5ba7d52969ec Mon Sep 17 00:00:00 2001 +From fda3043d8caa6d21aabe22bc4bd0f89d23097269 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 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index 341038fc4..3e1f4be10 100644 +index 341038fc4d..3e1f4be10f 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java @@ -92,4 +92,20 @@ public class PaperWorldConfig { @@ -30,7 +30,7 @@ index 341038fc4..3e1f4be10 100644 + } } diff --git a/src/main/java/net/minecraft/server/EntityInsentient.java b/src/main/java/net/minecraft/server/EntityInsentient.java -index 946e89c49..e9203479a 100644 +index 679dda76e4..d020414f98 100644 --- a/src/main/java/net/minecraft/server/EntityInsentient.java +++ b/src/main/java/net/minecraft/server/EntityInsentient.java @@ -612,11 +612,11 @@ public abstract class EntityInsentient extends EntityLiving { 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 93adf4160a..73a5bd55c1 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 0b044b5e02fe8181fd259c98ce1fefd8870f7c30 Mon Sep 17 00:00:00 2001 +From 0e71efa3741909c111c361ecbbb659a358286ec0 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 3e1f4be10f..3f734327c0 100644 + } } diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index eabcab0244..446f864420 100644 +index d7b3b4b8c8..df681c5d6b 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -152,6 +152,7 @@ public abstract class World implements IIBlockAccess, GeneratorAccess, AutoClose 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 ce1d32aa8e..08683a447a 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 3ddcc8e9b829b3ba3fd1083e2cbe543a5f9c0c63 Mon Sep 17 00:00:00 2001 +From bec67ae8da09883ca152b632b9adbeeb0507f6ae 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 3f734327c0..1ed58f4bba 100644 + } } diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java -index 510ebc72d8..899e6af69d 100644 +index c348d6bec3..f5647a171d 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java @@ -1788,6 +1788,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke 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 3ffec32384..40af90c9a6 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 67efce64363c3f4a39089b3e053b484dc2f02749 Mon Sep 17 00:00:00 2001 +From 79f892bd1fddeffcfce339ebaaacb7cf7b9aab23 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 @@ -19,7 +19,7 @@ index 3f35a28ba1..cf00f35a5b 100644 throwable = throwable1; throw throwable1; diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index df9098955c..f071c3c043 100644 +index c76620f2b3..2fc8c192b3 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -1287,7 +1287,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant Date: Mon, 27 May 2019 03:40:05 -0500 Subject: [PATCH] Implement Paper VersionChecker @@ -6,7 +6,7 @@ Subject: [PATCH] Implement Paper VersionChecker diff --git a/src/main/java/com/destroystokyo/paper/PaperVersionFetcher.java b/src/main/java/com/destroystokyo/paper/PaperVersionFetcher.java new file mode 100644 -index 000000000..ded51d042 +index 0000000000..ded51d042b --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/PaperVersionFetcher.java @@ -0,0 +1,115 @@ @@ -126,7 +126,7 @@ index 000000000..ded51d042 + } +} diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java -index 6775bf043..bb29b329b 100644 +index f7fdd0727b..ee5616cdfc 100644 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java @@ -276,6 +276,11 @@ public final class CraftMagicNumbers implements UnsafeValues { 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 817f4c8f15..6951f275dd 100644 --- a/Spigot-Server-Patches/0019-Add-version-history-to-version-command.patch +++ b/Spigot-Server-Patches/0019-Add-version-history-to-version-command.patch @@ -1,11 +1,11 @@ -From 112fed4d2354c631d78ee23707749acf131615df Mon Sep 17 00:00:00 2001 +From c6d12fdc8c38f2b3d92c910f7bcba6a4fe87ba2e Mon Sep 17 00:00:00 2001 From: Kyle Wood Date: Thu, 1 Mar 2018 19:37:52 -0600 Subject: [PATCH] Add version history to version command diff --git a/src/main/java/com/destroystokyo/paper/PaperVersionFetcher.java b/src/main/java/com/destroystokyo/paper/PaperVersionFetcher.java -index ded51d042..513cddb9b 100644 +index ded51d042b..513cddb9bd 100644 --- a/src/main/java/com/destroystokyo/paper/PaperVersionFetcher.java +++ b/src/main/java/com/destroystokyo/paper/PaperVersionFetcher.java @@ -25,7 +25,10 @@ public class PaperVersionFetcher implements VersionFetcher { @@ -42,7 +42,7 @@ index ded51d042..513cddb9b 100644 } diff --git a/src/main/java/com/destroystokyo/paper/VersionHistoryManager.java b/src/main/java/com/destroystokyo/paper/VersionHistoryManager.java new file mode 100644 -index 000000000..aac3f66cb +index 0000000000..aac3f66cb2 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/VersionHistoryManager.java @@ -0,0 +1,145 @@ @@ -192,7 +192,7 @@ index 000000000..aac3f66cb + } +} diff --git a/src/main/java/net/minecraft/server/DedicatedServer.java b/src/main/java/net/minecraft/server/DedicatedServer.java -index 19e2df309..f0e2250cd 100644 +index 19e2df3098..f0e2250cd8 100644 --- a/src/main/java/net/minecraft/server/DedicatedServer.java +++ b/src/main/java/net/minecraft/server/DedicatedServer.java @@ -160,6 +160,7 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer diff --git a/Spigot-Server-Patches/0020-Player-affects-spawning-API.patch b/Spigot-Server-Patches/0020-Player-affects-spawning-API.patch index a75fd475d9..824464022f 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 49c5bdc934ad55d573f1f70539b1b9a4e38ff4e2 Mon Sep 17 00:00:00 2001 +From c36d61e7a6ea90de04c044568a1143d079a7cd9e 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 e0edea22f..51dcb5ff0 100644 +index 28791cca90..418e2fccdc 100644 --- a/src/main/java/net/minecraft/server/EntityHuman.java +++ b/src/main/java/net/minecraft/server/EntityHuman.java @@ -70,6 +70,9 @@ public abstract class EntityHuman extends EntityLiving { @@ -19,7 +19,7 @@ index e0edea22f..51dcb5ff0 100644 // CraftBukkit start public boolean fauxSleeping; diff --git a/src/main/java/net/minecraft/server/EntityInsentient.java b/src/main/java/net/minecraft/server/EntityInsentient.java -index e9203479a..00b51d88b 100644 +index d020414f98..0ecbf873bf 100644 --- a/src/main/java/net/minecraft/server/EntityInsentient.java +++ b/src/main/java/net/minecraft/server/EntityInsentient.java @@ -609,7 +609,7 @@ public abstract class EntityInsentient extends EntityLiving { @@ -32,7 +32,7 @@ index e9203479a..00b51d88b 100644 if (d0 > world.paperConfig.hardDespawnDistance) { // CraftBukkit - remove isTypeNotPersistent() check // Paper - custom despawn distances diff --git a/src/main/java/net/minecraft/server/EntitySilverfish.java b/src/main/java/net/minecraft/server/EntitySilverfish.java -index dbbc34d91..d823c6b6d 100644 +index dbbc34d91b..d823c6b6d9 100644 --- a/src/main/java/net/minecraft/server/EntitySilverfish.java +++ b/src/main/java/net/minecraft/server/EntitySilverfish.java @@ -106,7 +106,7 @@ public class EntitySilverfish extends EntityMonster { @@ -45,7 +45,7 @@ index dbbc34d91..d823c6b6d 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 8980de820..6085f293d 100644 +index 8980de8203..6085f293d0 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -1641,7 +1641,19 @@ public class CraftPlayer extends CraftHumanEntity implements Player { 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 08d954f5da..2788fadb69 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 8a87e6f9ebf29d370013a3b135f3ea3f91d96d1a Mon Sep 17 00:00:00 2001 +From 20fed96517ece7362b83497bfa757d4f43deef96 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 4ec0c2223..318035a48 100644 +index 3de0f69758..e990445196 100644 --- a/src/main/java/net/minecraft/server/Chunk.java +++ b/src/main/java/net/minecraft/server/Chunk.java @@ -506,6 +506,10 @@ public class Chunk implements IChunkAccess { diff --git a/Spigot-Server-Patches/0022-Optimize-TileEntity-Ticking.patch b/Spigot-Server-Patches/0022-Optimize-TileEntity-Ticking.patch index d652a5d594..884976ed7c 100644 --- a/Spigot-Server-Patches/0022-Optimize-TileEntity-Ticking.patch +++ b/Spigot-Server-Patches/0022-Optimize-TileEntity-Ticking.patch @@ -1,4 +1,4 @@ -From 195dfa8d4c59b64e7d1b039bf9c127b5d879f080 Mon Sep 17 00:00:00 2001 +From 8dfa3edb832bb62c70031443a0547f8772a07431 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sun, 8 Mar 2015 22:55:25 -0600 Subject: [PATCH] Optimize TileEntity Ticking 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 4d4625d6f2..8950b8b624 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 872546911a19e8385a950c600ed0c7a7ddbb0ac3 Mon Sep 17 00:00:00 2001 +From 2ab94f4b9d67db2a2c033d0d1c9d61e9ade7cead Mon Sep 17 00:00:00 2001 From: Aikar Date: Tue, 1 Mar 2016 23:09:29 -0600 Subject: [PATCH] Further improve server tick loop @@ -12,7 +12,7 @@ Previous implementation did not calculate TPS correctly. Switch to a realistic rolling average and factor in std deviation as an extra reporting variable diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 2fc8c192b..cf7a75b2e 100644 +index 2fc8c192b3..cf7a75b2e2 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -150,7 +150,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant 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 6085f293d..26ee5444f 100644 +index 6085f293d0..26ee5444f8 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -1330,12 +1330,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player { diff --git a/Spigot-Server-Patches/0025-Entity-Origin-API.patch b/Spigot-Server-Patches/0025-Entity-Origin-API.patch index 886683c88b..93c62d77fa 100644 --- a/Spigot-Server-Patches/0025-Entity-Origin-API.patch +++ b/Spigot-Server-Patches/0025-Entity-Origin-API.patch @@ -1,11 +1,11 @@ -From 40c3d38fd6f36e6bbee006591547e3dbf8864ee9 Mon Sep 17 00:00:00 2001 +From d6edbbaa9be1ec80e3a596e76a32457d950744c2 Mon Sep 17 00:00:00 2001 From: Byteflux Date: Tue, 1 Mar 2016 23:45:08 -0600 Subject: [PATCH] Entity Origin API diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java -index 0a17a16c5..34285a99b 100644 +index f5647a171d..205376f6af 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java @@ -163,6 +163,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke @@ -51,7 +51,7 @@ index 0a17a16c5..34285a99b 100644 NBTTagList nbttaglist = new NBTTagList(); double[] adouble1 = adouble; diff --git a/src/main/java/net/minecraft/server/EntityFallingBlock.java b/src/main/java/net/minecraft/server/EntityFallingBlock.java -index 55591fbe0..90becdfde 100644 +index 55591fbe05..90becdfdec 100644 --- a/src/main/java/net/minecraft/server/EntityFallingBlock.java +++ b/src/main/java/net/minecraft/server/EntityFallingBlock.java @@ -245,6 +245,14 @@ public class EntityFallingBlock extends Entity { @@ -70,7 +70,7 @@ index 55591fbe0..90becdfde 100644 public void a(boolean flag) { diff --git a/src/main/java/net/minecraft/server/EntityTNTPrimed.java b/src/main/java/net/minecraft/server/EntityTNTPrimed.java -index e3001570f..e0535604b 100644 +index e3001570f9..e0535604b6 100644 --- a/src/main/java/net/minecraft/server/EntityTNTPrimed.java +++ b/src/main/java/net/minecraft/server/EntityTNTPrimed.java @@ -104,6 +104,14 @@ public class EntityTNTPrimed extends Entity { @@ -89,7 +89,7 @@ index e3001570f..e0535604b 100644 @Nullable diff --git a/src/main/java/net/minecraft/server/NBTTagList.java b/src/main/java/net/minecraft/server/NBTTagList.java -index ce510c486..b7c94fe23 100644 +index ce510c4867..b7c94fe238 100644 --- a/src/main/java/net/minecraft/server/NBTTagList.java +++ b/src/main/java/net/minecraft/server/NBTTagList.java @@ -161,6 +161,7 @@ public class NBTTagList extends NBTList { @@ -101,7 +101,7 @@ index ce510c486..b7c94fe23 100644 if (i >= 0 && i < this.list.size()) { NBTBase nbtbase = (NBTBase) this.list.get(i); diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java -index 089468835..fc582fead 100644 +index 089468835b..fc582fead6 100644 --- a/src/main/java/net/minecraft/server/WorldServer.java +++ b/src/main/java/net/minecraft/server/WorldServer.java @@ -1095,6 +1095,11 @@ public class WorldServer extends World { @@ -117,7 +117,7 @@ index 089468835..fc582fead 100644 } diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java -index a98f6f338..d1d37c06b 100644 +index a98f6f3389..d1d37c06bf 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java @@ -1009,4 +1009,12 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity { 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 9e51021e28..17cfc23529 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,11 +1,11 @@ -From 8027dc71e7d0b0467b17faa47ded3a1972a687ad Mon Sep 17 00:00:00 2001 +From 3aac318eaf63309fdee0aa327f084a44d99add85 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 diff --git a/src/main/java/net/minecraft/server/TileEntity.java b/src/main/java/net/minecraft/server/TileEntity.java -index 095ef9ba5..b99bcbf8a 100644 +index a833781e59..1307152997 100644 --- a/src/main/java/net/minecraft/server/TileEntity.java +++ b/src/main/java/net/minecraft/server/TileEntity.java @@ -199,7 +199,12 @@ public abstract class TileEntity implements KeyedObject { // Paper @@ -23,7 +23,7 @@ index 095ef9ba5..b99bcbf8a 100644 } } diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index d659b7613..436957489 100644 +index df681c5d6b..26c93af981 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -718,11 +718,13 @@ public abstract class World implements IIBlockAccess, GeneratorAccess, AutoClose 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 030587ff51..1db38775b5 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,11 +1,11 @@ -From b0268160dfc28f598d49d21353df1a308d1e6bf4 Mon Sep 17 00:00:00 2001 +From b3b6094ce21d9d0374efe828ed432703e3ad5085 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 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index 1ed58f4bb..a797a5767 100644 +index 1ed58f4bba..a797a57671 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java @@ -124,4 +124,19 @@ public class PaperWorldConfig { @@ -29,7 +29,7 @@ index 1ed58f4bb..a797a5767 100644 + } } diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java -index de57289fe..fef69c7c3 100644 +index 205376f6af..8165655c31 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java @@ -397,9 +397,15 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke @@ -75,7 +75,7 @@ index de57289fe..fef69c7c3 100644 this.die(); } diff --git a/src/main/java/net/minecraft/server/EntityMinecartAbstract.java b/src/main/java/net/minecraft/server/EntityMinecartAbstract.java -index 4d2ef9a02..6fc332dbf 100644 +index 9dcf8d7142..2a2105cbce 100644 --- a/src/main/java/net/minecraft/server/EntityMinecartAbstract.java +++ b/src/main/java/net/minecraft/server/EntityMinecartAbstract.java @@ -182,9 +182,15 @@ public abstract class EntityMinecartAbstract extends Entity { 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 f09d29a058..f94a3a506d 100644 --- a/Spigot-Server-Patches/0028-Check-online-mode-before-converting-and-renaming-pla.patch +++ b/Spigot-Server-Patches/0028-Check-online-mode-before-converting-and-renaming-pla.patch @@ -1,11 +1,11 @@ -From 6cf080c4ed100a070e3a3db48082c746ef80494b Mon Sep 17 00:00:00 2001 +From cfad7387b6b193192017abf0eea65a134ddc9f47 Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Wed, 2 Mar 2016 00:03:55 -0600 Subject: [PATCH] Check online mode before converting and renaming player data diff --git a/src/main/java/net/minecraft/server/WorldNBTStorage.java b/src/main/java/net/minecraft/server/WorldNBTStorage.java -index 97bac7d25..a0254d8e5 100644 +index 97bac7d257..a0254d8e51 100644 --- a/src/main/java/net/minecraft/server/WorldNBTStorage.java +++ b/src/main/java/net/minecraft/server/WorldNBTStorage.java @@ -164,7 +164,7 @@ public class WorldNBTStorage implements IPlayerFileData { diff --git a/Spigot-Server-Patches/0029-Always-tick-falling-blocks.patch b/Spigot-Server-Patches/0029-Always-tick-falling-blocks.patch index cdf29fe591..f3bf82b78f 100644 --- a/Spigot-Server-Patches/0029-Always-tick-falling-blocks.patch +++ b/Spigot-Server-Patches/0029-Always-tick-falling-blocks.patch @@ -1,11 +1,11 @@ -From 3682a27d416cb1560d436216474921fa3af40743 Mon Sep 17 00:00:00 2001 +From 14a5d40f22d43c57dc4b17c54c1af7fd0d7b5abf Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Wed, 2 Mar 2016 00:32:25 -0600 Subject: [PATCH] Always tick falling blocks diff --git a/src/main/java/org/spigotmc/ActivationRange.java b/src/main/java/org/spigotmc/ActivationRange.java -index 106e9d7e2..7341dc2c1 100644 +index 106e9d7e2d..7341dc2c1c 100644 --- a/src/main/java/org/spigotmc/ActivationRange.java +++ b/src/main/java/org/spigotmc/ActivationRange.java @@ -13,6 +13,7 @@ import net.minecraft.server.EntityCreature; diff --git a/Spigot-Server-Patches/0030-Configurable-end-credits.patch b/Spigot-Server-Patches/0030-Configurable-end-credits.patch index f1eb412d11..78f43d611c 100644 --- a/Spigot-Server-Patches/0030-Configurable-end-credits.patch +++ b/Spigot-Server-Patches/0030-Configurable-end-credits.patch @@ -1,11 +1,11 @@ -From 373b835aba474fdea61c957499a637dc6578a894 Mon Sep 17 00:00:00 2001 +From 21060900b0f5389481f833c2a89f33e89b8f7f5a Mon Sep 17 00:00:00 2001 From: DoctorDark Date: Wed, 16 Mar 2016 02:21:39 -0500 Subject: [PATCH] Configurable end credits diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index a797a5767..c2b9690a0 100644 +index a797a57671..c2b9690a0c 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java @@ -139,4 +139,10 @@ public class PaperWorldConfig { @@ -20,7 +20,7 @@ index a797a5767..c2b9690a0 100644 + } } diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java -index 995acea72..db0a559fe 100644 +index 648f7f986c..f15308d7f9 100644 --- a/src/main/java/net/minecraft/server/EntityPlayer.java +++ b/src/main/java/net/minecraft/server/EntityPlayer.java @@ -60,7 +60,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting { diff --git a/Spigot-Server-Patches/0031-Fix-lag-from-explosions-processing-dead-entities.patch b/Spigot-Server-Patches/0031-Fix-lag-from-explosions-processing-dead-entities.patch index 8d4c9c7ea9..40e3207473 100644 --- a/Spigot-Server-Patches/0031-Fix-lag-from-explosions-processing-dead-entities.patch +++ b/Spigot-Server-Patches/0031-Fix-lag-from-explosions-processing-dead-entities.patch @@ -1,11 +1,11 @@ -From bc6c4d922d07fce592e1d778d570402285ed8125 Mon Sep 17 00:00:00 2001 +From 5d1c13800e7aac7ba60a8cb72827547959b5a558 Mon Sep 17 00:00:00 2001 From: Iceee Date: Wed, 2 Mar 2016 01:39:52 -0600 Subject: [PATCH] Fix lag from explosions processing dead entities diff --git a/src/main/java/net/minecraft/server/Explosion.java b/src/main/java/net/minecraft/server/Explosion.java -index 462f8f33a..e1c628f17 100644 +index 462f8f33a1..e1c628f177 100644 --- a/src/main/java/net/minecraft/server/Explosion.java +++ b/src/main/java/net/minecraft/server/Explosion.java @@ -146,7 +146,14 @@ public class Explosion { @@ -25,7 +25,7 @@ index 462f8f33a..e1c628f17 100644 for (int l1 = 0; l1 < list.size(); ++l1) { diff --git a/src/main/java/net/minecraft/server/IEntitySelector.java b/src/main/java/net/minecraft/server/IEntitySelector.java -index e2744dc40..9bf191945 100644 +index e2744dc40d..9bf1919451 100644 --- a/src/main/java/net/minecraft/server/IEntitySelector.java +++ b/src/main/java/net/minecraft/server/IEntitySelector.java @@ -14,6 +14,7 @@ public final class IEntitySelector { diff --git a/Spigot-Server-Patches/0032-Optimize-explosions.patch b/Spigot-Server-Patches/0032-Optimize-explosions.patch index df96032c09..2089d1589c 100644 --- a/Spigot-Server-Patches/0032-Optimize-explosions.patch +++ b/Spigot-Server-Patches/0032-Optimize-explosions.patch @@ -1,4 +1,4 @@ -From fc3123da2e3b645b7f3b041a28f8a6cf5ba7762f Mon Sep 17 00:00:00 2001 +From 6a0df23f0a560827b09cd48249354c6b6624df20 Mon Sep 17 00:00:00 2001 From: Byteflux Date: Wed, 2 Mar 2016 11:59:48 -0600 Subject: [PATCH] Optimize explosions @@ -10,7 +10,7 @@ This patch adds a per-tick cache that is used for storing and retrieving an entity's exposure during an explosion. diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index c2b9690a0..a5ec0bc0e 100644 +index c2b9690a0c..a5ec0bc0e0 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java @@ -145,4 +145,10 @@ public class PaperWorldConfig { @@ -25,7 +25,7 @@ index c2b9690a0..a5ec0bc0e 100644 + } } diff --git a/src/main/java/net/minecraft/server/Explosion.java b/src/main/java/net/minecraft/server/Explosion.java -index e1c628f17..bcff11761 100644 +index e1c628f177..bcff117619 100644 --- a/src/main/java/net/minecraft/server/Explosion.java +++ b/src/main/java/net/minecraft/server/Explosion.java @@ -172,7 +172,7 @@ public class Explosion { @@ -123,7 +123,7 @@ index e1c628f17..bcff11761 100644 + // Paper end } diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index cf7a75b2e..454e28fc4 100644 +index cf7a75b2e2..454e28fc47 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -1131,6 +1131,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant Date: Wed, 2 Mar 2016 14:48:03 -0600 Subject: [PATCH] Disable explosion knockback @@ -19,7 +19,7 @@ index a5ec0bc0e0..6a307d5dd6 100644 + } } diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java -index 4830c0bd73..cb23417ffa 100644 +index 678dae6dae..061f708aea 100644 --- a/src/main/java/net/minecraft/server/EntityLiving.java +++ b/src/main/java/net/minecraft/server/EntityLiving.java @@ -1118,6 +1118,7 @@ public abstract class EntityLiving extends Entity { diff --git a/Spigot-Server-Patches/0034-Disable-thunder.patch b/Spigot-Server-Patches/0034-Disable-thunder.patch index a78e4d5eb2..ceb0fc6140 100644 --- a/Spigot-Server-Patches/0034-Disable-thunder.patch +++ b/Spigot-Server-Patches/0034-Disable-thunder.patch @@ -1,11 +1,11 @@ -From 735d20a751f13594e2a2326e4ff8a2c361ea4a8e Mon Sep 17 00:00:00 2001 +From 2baf1144d00277d1b7285978b2ce7911b5fb3613 Mon Sep 17 00:00:00 2001 From: Sudzzy Date: Wed, 2 Mar 2016 14:52:43 -0600 Subject: [PATCH] Disable thunder diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index 6a307d5dd..bf0cd6a8b 100644 +index 6a307d5dd6..bf0cd6a8b4 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java @@ -156,4 +156,9 @@ public class PaperWorldConfig { @@ -19,7 +19,7 @@ index 6a307d5dd..bf0cd6a8b 100644 + } } diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java -index 4710b79af..9bf3726c8 100644 +index fc582fead6..91ec2f9842 100644 --- a/src/main/java/net/minecraft/server/WorldServer.java +++ b/src/main/java/net/minecraft/server/WorldServer.java @@ -384,7 +384,7 @@ public class WorldServer extends World { diff --git a/Spigot-Server-Patches/0035-Disable-ice-and-snow.patch b/Spigot-Server-Patches/0035-Disable-ice-and-snow.patch index 5d9a47fdb8..c2262f81e3 100644 --- a/Spigot-Server-Patches/0035-Disable-ice-and-snow.patch +++ b/Spigot-Server-Patches/0035-Disable-ice-and-snow.patch @@ -1,11 +1,11 @@ -From 75fe9bdeea87e7fd94963c78f278e6db61e6fb80 Mon Sep 17 00:00:00 2001 +From e08725d1011816de8ed06434d093341fa42c8733 Mon Sep 17 00:00:00 2001 From: Sudzzy Date: Wed, 2 Mar 2016 14:57:24 -0600 Subject: [PATCH] Disable ice and snow diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index bf0cd6a8b..8db5c3f3f 100644 +index bf0cd6a8b4..8db5c3f3fe 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java @@ -161,4 +161,9 @@ public class PaperWorldConfig { @@ -19,7 +19,7 @@ index bf0cd6a8b..8db5c3f3f 100644 + } } diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java -index 9bf3726c8..999a67ebf 100644 +index 91ec2f9842..7b78946ece 100644 --- a/src/main/java/net/minecraft/server/WorldServer.java +++ b/src/main/java/net/minecraft/server/WorldServer.java @@ -404,7 +404,7 @@ public class WorldServer extends World { 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 784e23f133..d49f473c9e 100644 --- a/Spigot-Server-Patches/0036-Configurable-mob-spawner-tick-rate.patch +++ b/Spigot-Server-Patches/0036-Configurable-mob-spawner-tick-rate.patch @@ -1,11 +1,11 @@ -From 0ddb763372e5551b2769d995f5f6ec8e44720fea Mon Sep 17 00:00:00 2001 +From b352a214af7f4c59c1cfc933269a6f02bd424366 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 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index 8db5c3f3f..e4e00e2e1 100644 +index 8db5c3f3fe..e4e00e2e1c 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java @@ -166,4 +166,9 @@ public class PaperWorldConfig { @@ -19,7 +19,7 @@ index 8db5c3f3f..e4e00e2e1 100644 + } } diff --git a/src/main/java/net/minecraft/server/MobSpawnerAbstract.java b/src/main/java/net/minecraft/server/MobSpawnerAbstract.java -index a2140cb6c..b3af4ba23 100644 +index a2140cb6c5..b3af4ba233 100644 --- a/src/main/java/net/minecraft/server/MobSpawnerAbstract.java +++ b/src/main/java/net/minecraft/server/MobSpawnerAbstract.java @@ -23,6 +23,7 @@ public abstract class MobSpawnerAbstract { 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 77e708b858..c0bf5dc259 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 28bfe29b176f9cf6a0549258b52db485937e19b1 Mon Sep 17 00:00:00 2001 +From c4cb8bf766ee6eef0661fdec66b42a8c7c14f014 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 315c3d9165..aaf3a54b08 100644 this.c(); diff --git a/src/main/java/net/minecraft/server/PlayerChunkMap.java b/src/main/java/net/minecraft/server/PlayerChunkMap.java -index 44e3340773..cfc7f5a118 100644 +index db159baab2..d9d253ea09 100644 --- a/src/main/java/net/minecraft/server/PlayerChunkMap.java +++ b/src/main/java/net/minecraft/server/PlayerChunkMap.java @@ -1083,10 +1083,14 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d { diff --git a/Spigot-Server-Patches/0038-Add-BeaconEffectEvent.patch b/Spigot-Server-Patches/0038-Add-BeaconEffectEvent.patch index afec31b175..de3b6e1853 100644 --- a/Spigot-Server-Patches/0038-Add-BeaconEffectEvent.patch +++ b/Spigot-Server-Patches/0038-Add-BeaconEffectEvent.patch @@ -1,4 +1,4 @@ -From 28757030f4069ac3ae421cf13c6d932ab01383f9 Mon Sep 17 00:00:00 2001 +From 8baabe148fe796391d1e3fc38c8c8ad33008bbc0 Mon Sep 17 00:00:00 2001 From: Byteflux Date: Wed, 2 Mar 2016 23:30:53 -0600 Subject: [PATCH] Add BeaconEffectEvent diff --git a/Spigot-Server-Patches/0039-Configurable-container-update-tick-rate.patch b/Spigot-Server-Patches/0039-Configurable-container-update-tick-rate.patch index 7a4ba2e212..c70fd89a16 100644 --- a/Spigot-Server-Patches/0039-Configurable-container-update-tick-rate.patch +++ b/Spigot-Server-Patches/0039-Configurable-container-update-tick-rate.patch @@ -1,11 +1,11 @@ -From 02f36547d23e1af8afedf1c7e031c288b8a97a1b Mon Sep 17 00:00:00 2001 +From 7c77336d40c74447645cc93c9afcc6a604098cf0 Mon Sep 17 00:00:00 2001 From: Sudzzy Date: Wed, 2 Mar 2016 23:34:44 -0600 Subject: [PATCH] Configurable container update tick rate diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index e4e00e2e1..d663b15ce 100644 +index e4e00e2e1c..d663b15ceb 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java @@ -171,4 +171,9 @@ public class PaperWorldConfig { @@ -19,7 +19,7 @@ index e4e00e2e1..d663b15ce 100644 + } } diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java -index db0a559fe..7eaef7f6b 100644 +index f15308d7f9..a385035748 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 { 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 e3f14b04da..84e8f60ec4 100644 --- a/Spigot-Server-Patches/0040-Use-UserCache-for-player-heads.patch +++ b/Spigot-Server-Patches/0040-Use-UserCache-for-player-heads.patch @@ -1,11 +1,11 @@ -From bed33fb7866d2760f7fb79a8b8534c7468de5764 Mon Sep 17 00:00:00 2001 +From 9c4c5b95fc5c5a04f6646d260c48ea7a72d4a83e 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 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaSkull.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaSkull.java -index c83bebe70..0136e1bfe 100644 +index c83bebe709..0136e1bfe1 100644 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaSkull.java +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaSkull.java @@ -155,7 +155,13 @@ class CraftMetaSkull extends CraftMetaItem implements SkullMeta { diff --git a/Spigot-Server-Patches/0041-Disable-spigot-tick-limiters.patch b/Spigot-Server-Patches/0041-Disable-spigot-tick-limiters.patch index da0c5dab9b..f42a1ebba4 100644 --- a/Spigot-Server-Patches/0041-Disable-spigot-tick-limiters.patch +++ b/Spigot-Server-Patches/0041-Disable-spigot-tick-limiters.patch @@ -1,11 +1,11 @@ -From eb9ae3776e369402d182595469709c374a4f254a Mon Sep 17 00:00:00 2001 +From f95651b3c8c5bc05371d739ec420b86cdd010414 Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Wed, 2 Mar 2016 23:45:17 -0600 Subject: [PATCH] Disable spigot tick limiters diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index c792b713f..6d900669d 100644 +index 5b21f87d13..90548096f6 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -689,9 +689,7 @@ public abstract class World implements IIBlockAccess, GeneratorAccess, AutoClose diff --git a/Spigot-Server-Patches/0042-Add-PlayerInitialSpawnEvent.patch b/Spigot-Server-Patches/0042-Add-PlayerInitialSpawnEvent.patch index 646890af68..b2d6118e63 100644 --- a/Spigot-Server-Patches/0042-Add-PlayerInitialSpawnEvent.patch +++ b/Spigot-Server-Patches/0042-Add-PlayerInitialSpawnEvent.patch @@ -1,4 +1,4 @@ -From ec739e1cdd5521ae380b82b57928bb0c77f5061f Mon Sep 17 00:00:00 2001 +From 5d9e90c12f143c8e173612fceb3ce45709e6c172 Mon Sep 17 00:00:00 2001 From: Steve Anton Date: Thu, 3 Mar 2016 00:09:38 -0600 Subject: [PATCH] Add PlayerInitialSpawnEvent @@ -6,7 +6,7 @@ Subject: [PATCH] Add PlayerInitialSpawnEvent For modifying a player's initial spawn location as they join the server diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java -index bab32af46..b647e4287 100644 +index 1ee1df0757..9390ac96fa 100644 --- a/src/main/java/net/minecraft/server/PlayerList.java +++ b/src/main/java/net/minecraft/server/PlayerList.java @@ -109,7 +109,22 @@ public abstract class PlayerList { 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 e2275353b7..ffe0ff638f 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 bbe0f21f7cd3c2f44aa4e67a1edf3262979f012c Mon Sep 17 00:00:00 2001 +From 56ec50c12a7224e1a9077f8a1421b3b05c92466c 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 @@ -6,7 +6,7 @@ Subject: [PATCH] Configurable Disabling Cat Chest Detection Offers a gameplay feature to stop cats from blocking chests diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index d663b15ce..278297039 100644 +index d663b15ceb..2782970393 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java @@ -176,4 +176,9 @@ public class PaperWorldConfig { @@ -20,7 +20,7 @@ index d663b15ce..278297039 100644 + } } diff --git a/src/main/java/net/minecraft/server/BlockChest.java b/src/main/java/net/minecraft/server/BlockChest.java -index 6b1c64e8f..ee9d91a8c 100644 +index 00b11a4b20..5fd6061f60 100644 --- a/src/main/java/net/minecraft/server/BlockChest.java +++ b/src/main/java/net/minecraft/server/BlockChest.java @@ -280,6 +280,11 @@ public class BlockChest extends BlockTileEntity implements IBlockWaterlogged { 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 ebba31302b..aaf0b35525 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 d3dc4c1f0dc202a099646722fdb1c6bde878cc74 Mon Sep 17 00:00:00 2001 +From 6a087e34d6de6c85b1da8acad49c09f3b8179057 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 d20037bd00..def713f495 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 d97cba9c04..a29b7b7927 100644 +index d37f4cdf4a..6c595a4c84 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -704,6 +704,29 @@ public final class CraftServer implements Server { 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 009533e1e8..7a53abe647 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,11 +1,11 @@ -From 2896f18be8082df36920c4478f6d070cd1e3a9bc Mon Sep 17 00:00:00 2001 +From c593eb80df22b2a70341169cacd8301439b1f4d6 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 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index 278297039..be91b1124 100644 +index 2782970393..be91b11242 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java @@ -181,4 +181,9 @@ public class PaperWorldConfig { @@ -19,7 +19,7 @@ index 278297039..be91b1124 100644 + } } diff --git a/src/main/java/net/minecraft/server/EntitySlime.java b/src/main/java/net/minecraft/server/EntitySlime.java -index 30bc933c2..96cf4bcce 100644 +index 30bc933c21..96cf4bccea 100644 --- a/src/main/java/net/minecraft/server/EntitySlime.java +++ b/src/main/java/net/minecraft/server/EntitySlime.java @@ -276,7 +276,7 @@ public class EntitySlime extends EntityInsentient implements IMonster { diff --git a/Spigot-Server-Patches/0046-Optimize-Pathfinding.patch b/Spigot-Server-Patches/0046-Optimize-Pathfinding.patch index 8c0bcd7d8f..6aabd406f9 100644 --- a/Spigot-Server-Patches/0046-Optimize-Pathfinding.patch +++ b/Spigot-Server-Patches/0046-Optimize-Pathfinding.patch @@ -1,4 +1,4 @@ -From b9c1926cb0c745f8fb394d57c4966b7264a76d16 Mon Sep 17 00:00:00 2001 +From b7d9668a905904c6115f9721a798c46d9887e3d0 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 49b27c431..75e01c242 100644 +index 49b27c4310..75e01c2420 100644 --- a/src/main/java/net/minecraft/server/NavigationAbstract.java +++ b/src/main/java/net/minecraft/server/NavigationAbstract.java @@ -118,10 +118,26 @@ public abstract class NavigationAbstract { diff --git a/Spigot-Server-Patches/0047-Expose-server-CommandMap.patch b/Spigot-Server-Patches/0047-Expose-server-CommandMap.patch index fcf372d4ec..222a9a0ad7 100644 --- a/Spigot-Server-Patches/0047-Expose-server-CommandMap.patch +++ b/Spigot-Server-Patches/0047-Expose-server-CommandMap.patch @@ -1,11 +1,11 @@ -From a9f87d27fac27702fbbc8cf0b84786be08c7841b Mon Sep 17 00:00:00 2001 +From 125359850e8e7f5ebf70cdf79ebb375a73aff898 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 a29b7b792..00b8fcb30 100644 +index 6c595a4c84..28decd9e75 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -1582,6 +1582,7 @@ public final class CraftServer implements Server { diff --git a/Spigot-Server-Patches/0048-Be-a-bit-more-informative-in-maxHealth-exception.patch b/Spigot-Server-Patches/0048-Be-a-bit-more-informative-in-maxHealth-exception.patch index cc58e10ebe..919d69ff3f 100644 --- a/Spigot-Server-Patches/0048-Be-a-bit-more-informative-in-maxHealth-exception.patch +++ b/Spigot-Server-Patches/0048-Be-a-bit-more-informative-in-maxHealth-exception.patch @@ -1,11 +1,11 @@ -From e21f94a077a0825523fcae4e77694381192518e4 Mon Sep 17 00:00:00 2001 +From 125b04c9bd78557a4b99843e23041b045c4c97e9 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 2e007d4ff..82b3c0a7d 100644 +index 2e007d4ffc..82b3c0a7de 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java @@ -104,7 +104,10 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity { diff --git a/Spigot-Server-Patches/0049-Player-Tab-List-and-Title-APIs.patch b/Spigot-Server-Patches/0049-Player-Tab-List-and-Title-APIs.patch index 35220f6f91..31136cc442 100644 --- a/Spigot-Server-Patches/0049-Player-Tab-List-and-Title-APIs.patch +++ b/Spigot-Server-Patches/0049-Player-Tab-List-and-Title-APIs.patch @@ -1,11 +1,11 @@ -From 78ba910a19023702a8a74487ebcf0a0268b336d0 Mon Sep 17 00:00:00 2001 +From 4ae9387ca3a8a6d4a6168ca50eef7f9bfa5ae775 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 diff --git a/src/main/java/net/minecraft/server/IChatBaseComponent.java b/src/main/java/net/minecraft/server/IChatBaseComponent.java -index aa8601920..6e867e234 100644 +index 2dc6342d46..1d0de5d9a7 100644 --- a/src/main/java/net/minecraft/server/IChatBaseComponent.java +++ b/src/main/java/net/minecraft/server/IChatBaseComponent.java @@ -433,6 +433,7 @@ public interface IChatBaseComponent extends Message, Iterable { @@ -52,7 +52,7 @@ index 3a6e78000..535056c64 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 26ee5444f..a09c02a1c 100644 +index 26ee5444f8..a09c02a1ce 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 @@ diff --git a/Spigot-Server-Patches/0050-Ensure-inv-drag-is-in-bounds.patch b/Spigot-Server-Patches/0050-Ensure-inv-drag-is-in-bounds.patch index 90e7924dd1..fc8cdf915b 100644 --- a/Spigot-Server-Patches/0050-Ensure-inv-drag-is-in-bounds.patch +++ b/Spigot-Server-Patches/0050-Ensure-inv-drag-is-in-bounds.patch @@ -1,11 +1,11 @@ -From 14e217c38aef00311746e82de53c24f08a995c19 Mon Sep 17 00:00:00 2001 +From 410f556513f7c9a3a717cf8e1f1ca091f3ae6f3f Mon Sep 17 00:00:00 2001 From: Joseph Hirschfeld Date: Thu, 3 Mar 2016 02:33:53 -0600 Subject: [PATCH] Ensure inv drag is in bounds diff --git a/src/main/java/net/minecraft/server/Container.java b/src/main/java/net/minecraft/server/Container.java -index 7a2799347..a2805011d 100644 +index 5cebc7506f..b4fcab4f08 100644 --- a/src/main/java/net/minecraft/server/Container.java +++ b/src/main/java/net/minecraft/server/Container.java @@ -201,7 +201,7 @@ public abstract class Container { diff --git a/Spigot-Server-Patches/0051-Change-implementation-of-tile-entity-removal-list.patch b/Spigot-Server-Patches/0051-Change-implementation-of-tile-entity-removal-list.patch index a765598b06..11bd1b8959 100644 --- a/Spigot-Server-Patches/0051-Change-implementation-of-tile-entity-removal-list.patch +++ b/Spigot-Server-Patches/0051-Change-implementation-of-tile-entity-removal-list.patch @@ -1,4 +1,4 @@ -From 5714232edbc1210d08b4aa3ac09f10d5545932ca Mon Sep 17 00:00:00 2001 +From 47e2061ebbab1f0363d1b821bb1888b042f34c53 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 6d900669d..72435a2c0 100644 +index 90548096f6..d44cf6164b 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -40,7 +40,7 @@ public abstract class World implements IIBlockAccess, GeneratorAccess, AutoClose diff --git a/Spigot-Server-Patches/0052-Add-configurable-portal-search-radius.patch b/Spigot-Server-Patches/0052-Add-configurable-portal-search-radius.patch index 9eefd59421..1d75be3f7a 100644 --- a/Spigot-Server-Patches/0052-Add-configurable-portal-search-radius.patch +++ b/Spigot-Server-Patches/0052-Add-configurable-portal-search-radius.patch @@ -1,11 +1,11 @@ -From 7b9635a220e06f4be8da1b0f7b446ce506068b1d Mon Sep 17 00:00:00 2001 +From 3cabf707eeccc8ce4744de883803556d295eb3af 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/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index be91b1124..320fd07c6 100644 +index be91b11242..320fd07c62 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java @@ -186,4 +186,9 @@ public class PaperWorldConfig { @@ -19,7 +19,7 @@ index be91b1124..320fd07c6 100644 + } } diff --git a/src/main/java/net/minecraft/server/PortalTravelAgent.java b/src/main/java/net/minecraft/server/PortalTravelAgent.java -index 576fd6172..524dc7daa 100644 +index 6552f9e25e..2f0a8e4bb6 100644 --- a/src/main/java/net/minecraft/server/PortalTravelAgent.java +++ b/src/main/java/net/minecraft/server/PortalTravelAgent.java @@ -70,10 +70,11 @@ public class PortalTravelAgent { diff --git a/Spigot-Server-Patches/0053-Add-velocity-warnings.patch b/Spigot-Server-Patches/0053-Add-velocity-warnings.patch index c90db49cfd..8b0b6c01f4 100644 --- a/Spigot-Server-Patches/0053-Add-velocity-warnings.patch +++ b/Spigot-Server-Patches/0053-Add-velocity-warnings.patch @@ -1,11 +1,11 @@ -From 347f8cdf5fb277a0f890d37684d941ab79d948fa Mon Sep 17 00:00:00 2001 +From e59ff35c66e9d235cc44b10539bb6da21eaebe30 Mon Sep 17 00:00:00 2001 From: Joseph Hirschfeld Date: Thu, 3 Mar 2016 02:48:12 -0600 Subject: [PATCH] Add velocity warnings diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 00b8fcb30..03e5d34be 100644 +index 28decd9e75..6820c5a2c7 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -230,6 +230,7 @@ public final class CraftServer implements Server { @@ -17,7 +17,7 @@ index 00b8fcb30..03e5d34be 100644 static { ConfigurationSerialization.registerClass(CraftOfflinePlayer.class); diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java -index d1d37c06b..ed496d03a 100644 +index d1d37c06bf..ed496d03ae 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java @@ -405,10 +405,41 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity { @@ -63,7 +63,7 @@ index d1d37c06b..ed496d03a 100644 public double getHeight() { return getHandle().getHeight(); diff --git a/src/main/java/org/spigotmc/WatchdogThread.java b/src/main/java/org/spigotmc/WatchdogThread.java -index 70b187190..56f5f54bd 100644 +index 70b187190f..56f5f54bd1 100644 --- a/src/main/java/org/spigotmc/WatchdogThread.java +++ b/src/main/java/org/spigotmc/WatchdogThread.java @@ -76,7 +76,19 @@ public class WatchdogThread extends Thread diff --git a/Spigot-Server-Patches/0054-Configurable-inter-world-teleportation-safety.patch b/Spigot-Server-Patches/0054-Configurable-inter-world-teleportation-safety.patch index 3fb1315872..c4f35e174e 100644 --- a/Spigot-Server-Patches/0054-Configurable-inter-world-teleportation-safety.patch +++ b/Spigot-Server-Patches/0054-Configurable-inter-world-teleportation-safety.patch @@ -1,4 +1,4 @@ -From aef9e9ba6a4e9c9845d0b20ae4409549507ef1cd Mon Sep 17 00:00:00 2001 +From cc84caac4992a5df5c2f5cbd093b827061a6b24c 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 @@ -16,7 +16,7 @@ The wanted destination was on top of the emerald block however the player ended This only is the case if the player is teleporting between worlds. diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index 320fd07c6..94f5c90b3 100644 +index 320fd07c62..94f5c90b3c 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java @@ -191,4 +191,9 @@ public class PaperWorldConfig { @@ -30,7 +30,7 @@ index 320fd07c6..94f5c90b3 100644 + } } diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index a09c02a1c..f4dde31e9 100644 +index a09c02a1ce..f4dde31e99 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -745,7 +745,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player { diff --git a/Spigot-Server-Patches/0055-Add-exception-reporting-event.patch b/Spigot-Server-Patches/0055-Add-exception-reporting-event.patch index 7dcaeebf70..080489475d 100644 --- a/Spigot-Server-Patches/0055-Add-exception-reporting-event.patch +++ b/Spigot-Server-Patches/0055-Add-exception-reporting-event.patch @@ -1,4 +1,4 @@ -From 7d15159724fb5e8c37ec67c019172a20da38230b Mon Sep 17 00:00:00 2001 +From bfd0d62bfb4b0a82bd3efb1fe925ec0a2180e3ab Mon Sep 17 00:00:00 2001 From: Joseph Hirschfeld Date: Thu, 3 Mar 2016 03:15:41 -0600 Subject: [PATCH] Add exception reporting event @@ -80,7 +80,7 @@ index e990445196..9b65972569 100644 } } diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java -index 8d183de2fc..417b8eab8e 100644 +index 2933439ba1..769794ad47 100644 --- a/src/main/java/net/minecraft/server/ChunkProviderServer.java +++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java @@ -16,6 +16,9 @@ import java.util.function.BooleanSupplier; @@ -121,7 +121,7 @@ index 2cb0962ff1..21a8ed3231 100644 } // CraftBukkit end diff --git a/src/main/java/net/minecraft/server/PlayerChunkMap.java b/src/main/java/net/minecraft/server/PlayerChunkMap.java -index 6c904968d7..ba59c561e8 100644 +index d9d253ea09..e0e11b6f2e 100644 --- a/src/main/java/net/minecraft/server/PlayerChunkMap.java +++ b/src/main/java/net/minecraft/server/PlayerChunkMap.java @@ -646,6 +646,7 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d { diff --git a/Spigot-Server-Patches/0056-Don-t-nest-if-we-don-t-need-to-when-cerealising-text.patch b/Spigot-Server-Patches/0056-Don-t-nest-if-we-don-t-need-to-when-cerealising-text.patch index 8b1186fb0b..f0a00e036c 100644 --- a/Spigot-Server-Patches/0056-Don-t-nest-if-we-don-t-need-to-when-cerealising-text.patch +++ b/Spigot-Server-Patches/0056-Don-t-nest-if-we-don-t-need-to-when-cerealising-text.patch @@ -1,4 +1,4 @@ -From 1b9570e9180e38839d6d39ac2a9667d84c63647e Mon Sep 17 00:00:00 2001 +From ad4e7eb251cba02c5a90dd40f81942d66d9dd532 Mon Sep 17 00:00:00 2001 From: kashike Date: Tue, 8 Mar 2016 18:28:43 -0800 Subject: [PATCH] Don't nest if we don't need to when cerealising text @@ -6,7 +6,7 @@ Subject: [PATCH] Don't nest if we don't need to when cerealising text diff --git a/src/main/java/net/minecraft/server/PacketPlayOutChat.java b/src/main/java/net/minecraft/server/PacketPlayOutChat.java -index fa4eab5b0..0ab611564 100644 +index fa4eab5b0b..0ab611564e 100644 --- a/src/main/java/net/minecraft/server/PacketPlayOutChat.java +++ b/src/main/java/net/minecraft/server/PacketPlayOutChat.java @@ -29,7 +29,14 @@ public class PacketPlayOutChat implements Packet { diff --git a/Spigot-Server-Patches/0057-Disable-Scoreboards-for-non-players-by-default.patch b/Spigot-Server-Patches/0057-Disable-Scoreboards-for-non-players-by-default.patch index e074a7d652..2685fe93ff 100644 --- a/Spigot-Server-Patches/0057-Disable-Scoreboards-for-non-players-by-default.patch +++ b/Spigot-Server-Patches/0057-Disable-Scoreboards-for-non-players-by-default.patch @@ -1,4 +1,4 @@ -From 5611fa13eb727dbe8ff7621e52566d7208458ef5 Mon Sep 17 00:00:00 2001 +From 39013942ca1045002895f874eddebcf912a50907 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 94f5c90b3c..30f0dcfd51 100644 + } } diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java -index e1b24a7517..bb293825d5 100644 +index 8165655c31..3d739c4316 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java @@ -2213,6 +2213,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke @@ -37,7 +37,7 @@ index e1b24a7517..bb293825d5 100644 } diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java -index cb23417ffa..0c771aec2a 100644 +index 061f708aea..d6475338b5 100644 --- a/src/main/java/net/minecraft/server/EntityLiving.java +++ b/src/main/java/net/minecraft/server/EntityLiving.java @@ -582,6 +582,7 @@ public abstract class EntityLiving extends Entity { diff --git a/Spigot-Server-Patches/0058-Add-methods-for-working-with-arrows-stuck-in-living-.patch b/Spigot-Server-Patches/0058-Add-methods-for-working-with-arrows-stuck-in-living-.patch index fb0f68c94a..779380f118 100644 --- a/Spigot-Server-Patches/0058-Add-methods-for-working-with-arrows-stuck-in-living-.patch +++ b/Spigot-Server-Patches/0058-Add-methods-for-working-with-arrows-stuck-in-living-.patch @@ -1,11 +1,11 @@ -From d34919be9cd4477522345cde214da56d535c6f92 Mon Sep 17 00:00:00 2001 +From 66895626ad0bde345df6d7e5e9d28a2d2236637e 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 82b3c0a7d..aa50435be 100644 +index 82b3c0a7de..aa50435bec 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java @@ -598,4 +598,16 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity { diff --git a/Spigot-Server-Patches/0059-Complete-resource-pack-API.patch b/Spigot-Server-Patches/0059-Complete-resource-pack-API.patch index e24b1468e0..dad026d3d0 100644 --- a/Spigot-Server-Patches/0059-Complete-resource-pack-API.patch +++ b/Spigot-Server-Patches/0059-Complete-resource-pack-API.patch @@ -1,4 +1,4 @@ -From ce75e47a009d18655e59df12ebc07d1868890bdd Mon Sep 17 00:00:00 2001 +From 17c887a140fed5f84f12f115dd34004617c744cf 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 diff --git a/Spigot-Server-Patches/0060-Chunk-Save-Reattempt.patch b/Spigot-Server-Patches/0060-Chunk-Save-Reattempt.patch index ebb51c0cad..667d074649 100644 --- a/Spigot-Server-Patches/0060-Chunk-Save-Reattempt.patch +++ b/Spigot-Server-Patches/0060-Chunk-Save-Reattempt.patch @@ -1,4 +1,4 @@ -From 1efc7501388c4bcf6414352067bca5b30503016a Mon Sep 17 00:00:00 2001 +From 32faa59af93736c3e6da3fcd3b8ee2daa5c4b62a Mon Sep 17 00:00:00 2001 From: Aikar Date: Mon, 4 Mar 2013 23:46:10 -0500 Subject: [PATCH] Chunk Save Reattempt @@ -6,7 +6,7 @@ Subject: [PATCH] Chunk Save Reattempt We commonly have "Stream Closed" errors on chunk saving, so this code should re-try to save the chunk in the event of failure and hopefully prevent rollbacks. diff --git a/src/main/java/net/minecraft/server/RegionFile.java b/src/main/java/net/minecraft/server/RegionFile.java -index 88b5aa3a5..b062a31c4 100644 +index 88b5aa3a51..b062a31c49 100644 --- a/src/main/java/net/minecraft/server/RegionFile.java +++ b/src/main/java/net/minecraft/server/RegionFile.java @@ -253,8 +253,7 @@ public class RegionFile implements AutoCloseable { @@ -20,7 +20,7 @@ index 88b5aa3a5..b062a31c4 100644 } diff --git a/src/main/java/net/minecraft/server/RegionFileCache.java b/src/main/java/net/minecraft/server/RegionFileCache.java -index ad76ed27d..20f563144 100644 +index 84fe9ee3bf..1ea9e5bb43 100644 --- a/src/main/java/net/minecraft/server/RegionFileCache.java +++ b/src/main/java/net/minecraft/server/RegionFileCache.java @@ -79,6 +79,7 @@ public abstract class RegionFileCache implements AutoCloseable { diff --git a/Spigot-Server-Patches/0061-Default-loading-permissions.yml-before-plugins.patch b/Spigot-Server-Patches/0061-Default-loading-permissions.yml-before-plugins.patch index adefecd001..f17e902e05 100644 --- a/Spigot-Server-Patches/0061-Default-loading-permissions.yml-before-plugins.patch +++ b/Spigot-Server-Patches/0061-Default-loading-permissions.yml-before-plugins.patch @@ -1,4 +1,4 @@ -From 8663eb2b698d8986a399d6060fd5b3d4c4c2a8d5 Mon Sep 17 00:00:00 2001 +From 5b4ba45f3457fc0c8b506bcf752a678b00b5a2ea 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 @@ -16,7 +16,7 @@ modify that. Under the previous logic, plugins were unable (cleanly) override pe A config option has been added for those who depend on the previous behavior, but I don't expect that. diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java -index 0c65afccf..6cc99ffe4 100644 +index 0c65afccfd..6cc99ffe43 100644 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java @@ -213,4 +213,9 @@ public class PaperConfig { @@ -30,7 +30,7 @@ index 0c65afccf..6cc99ffe4 100644 + } } diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 03e5d34be..6b1eb8b3a 100644 +index 6820c5a2c7..b58c7c8e8f 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -364,6 +364,7 @@ public final class CraftServer implements Server { diff --git a/Spigot-Server-Patches/0062-Allow-Reloading-of-Custom-Permissions.patch b/Spigot-Server-Patches/0062-Allow-Reloading-of-Custom-Permissions.patch index 17fa446856..954f78514b 100644 --- a/Spigot-Server-Patches/0062-Allow-Reloading-of-Custom-Permissions.patch +++ b/Spigot-Server-Patches/0062-Allow-Reloading-of-Custom-Permissions.patch @@ -1,4 +1,4 @@ -From 175764c80ff7de7c218b419ce841b83a4d59b8df Mon Sep 17 00:00:00 2001 +From f41f0799c4b36f18c6242655c3bd940edab5188f 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 6b1eb8b3a..dbc58436c 100644 +index b58c7c8e8f..68a40c12a9 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -2033,5 +2033,23 @@ public final class CraftServer implements Server { diff --git a/Spigot-Server-Patches/0063-Remove-Metadata-on-reload.patch b/Spigot-Server-Patches/0063-Remove-Metadata-on-reload.patch index 693b17f287..1493689f6d 100644 --- a/Spigot-Server-Patches/0063-Remove-Metadata-on-reload.patch +++ b/Spigot-Server-Patches/0063-Remove-Metadata-on-reload.patch @@ -1,4 +1,4 @@ -From dc8aa52ba9b344ae5b6514c3e684b5f32c1bceb4 Mon Sep 17 00:00:00 2001 +From 9183d69f841ddcc6a5e775868de2c4bdb33dc66e 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 dbc58436c..954eb497b 100644 +index 68a40c12a9..86aa2ad322 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -795,8 +795,18 @@ public final class CraftServer implements Server { diff --git a/Spigot-Server-Patches/0064-Undead-horse-leashing.patch b/Spigot-Server-Patches/0064-Undead-horse-leashing.patch index 2846830b39..6be6c2e388 100644 --- a/Spigot-Server-Patches/0064-Undead-horse-leashing.patch +++ b/Spigot-Server-Patches/0064-Undead-horse-leashing.patch @@ -1,4 +1,4 @@ -From 85a9949f6c8ea7a989f1ddb18dc7ed65df78be11 Mon Sep 17 00:00:00 2001 +From b92f5f2672c87979ac766f9548b45defe46b81fc Mon Sep 17 00:00:00 2001 From: Aikar Date: Fri, 18 Mar 2016 14:19:19 -0400 Subject: [PATCH] Undead horse leashing @@ -6,7 +6,7 @@ Subject: [PATCH] Undead horse leashing default false to match vanilla, but option to allow undead horse types to be leashed. diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index 30f0dcfd5..89556dc94 100644 +index 30f0dcfd51..89556dc94a 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java @@ -201,4 +201,9 @@ public class PaperWorldConfig { @@ -20,7 +20,7 @@ index 30f0dcfd5..89556dc94 100644 + } } diff --git a/src/main/java/net/minecraft/server/EntityHorseAbstract.java b/src/main/java/net/minecraft/server/EntityHorseAbstract.java -index e9f34c930..8ce2fca80 100644 +index e9f34c9307..8ce2fca806 100644 --- a/src/main/java/net/minecraft/server/EntityHorseAbstract.java +++ b/src/main/java/net/minecraft/server/EntityHorseAbstract.java @@ -107,7 +107,7 @@ public abstract class EntityHorseAbstract extends EntityAnimal implements IInven diff --git a/Spigot-Server-Patches/0065-Handle-Item-Meta-Inconsistencies.patch b/Spigot-Server-Patches/0065-Handle-Item-Meta-Inconsistencies.patch index fca3dcae54..3367465933 100644 --- a/Spigot-Server-Patches/0065-Handle-Item-Meta-Inconsistencies.patch +++ b/Spigot-Server-Patches/0065-Handle-Item-Meta-Inconsistencies.patch @@ -1,4 +1,4 @@ -From e81e85ec09ef4d3437f8dd2beee01fef91d9d539 Mon Sep 17 00:00:00 2001 +From 4deaa60933f00136be995784a545e3ebc80be176 Mon Sep 17 00:00:00 2001 From: Aikar Date: Thu, 28 May 2015 23:00:19 -0400 Subject: [PATCH] Handle Item Meta Inconsistencies @@ -18,7 +18,7 @@ For consistency, the old API methods now forward to use the ItemMeta API equivalents, and should deprecate the old API's. diff --git a/src/main/java/net/minecraft/server/ItemStack.java b/src/main/java/net/minecraft/server/ItemStack.java -index aa6a58dd8..b643a4123 100644 +index aa6a58dd88..b643a41235 100644 --- a/src/main/java/net/minecraft/server/ItemStack.java +++ b/src/main/java/net/minecraft/server/ItemStack.java @@ -7,6 +7,8 @@ import com.mojang.brigadier.StringReader; @@ -78,7 +78,7 @@ index aa6a58dd8..b643a4123 100644 public boolean hasEnchantments() { diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java -index 5d71addb0..00497350a 100644 +index 5d71addb0c..00497350a3 100644 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java @@ -178,28 +178,11 @@ public final class CraftItemStack extends ItemStack { @@ -193,7 +193,7 @@ index 5d71addb0..00497350a 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 7c8b515bc..bf7b226a4 100644 +index 7c8b515bc2..bf7b226a4f 100644 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java @@ -24,6 +24,7 @@ import java.util.ArrayList; diff --git a/Spigot-Server-Patches/0066-Configurable-Non-Player-Arrow-Despawn-Rate.patch b/Spigot-Server-Patches/0066-Configurable-Non-Player-Arrow-Despawn-Rate.patch index 8a7bdd78cc..ce74eba621 100644 --- a/Spigot-Server-Patches/0066-Configurable-Non-Player-Arrow-Despawn-Rate.patch +++ b/Spigot-Server-Patches/0066-Configurable-Non-Player-Arrow-Despawn-Rate.patch @@ -1,4 +1,4 @@ -From a109d2bc17727a91414d823c6490c4e248e653b3 Mon Sep 17 00:00:00 2001 +From 66fd6551df054fd1e144083ff38917b914d65565 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 @@ -6,7 +6,7 @@ Subject: [PATCH] Configurable Non Player Arrow Despawn Rate Can set a much shorter despawn rate for arrows that players can not pick up. diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index 89556dc94..98049567f 100644 +index 89556dc94a..98049567f4 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java @@ -206,4 +206,19 @@ public class PaperWorldConfig { @@ -30,7 +30,7 @@ index 89556dc94..98049567f 100644 + } } diff --git a/src/main/java/net/minecraft/server/EntityArrow.java b/src/main/java/net/minecraft/server/EntityArrow.java -index b50f996b6..531bb7f66 100644 +index 5c516021e4..28fc512bab 100644 --- a/src/main/java/net/minecraft/server/EntityArrow.java +++ b/src/main/java/net/minecraft/server/EntityArrow.java @@ -263,7 +263,7 @@ public abstract class EntityArrow extends Entity implements IProjectile { diff --git a/Spigot-Server-Patches/0067-Add-World-Util-Methods.patch b/Spigot-Server-Patches/0067-Add-World-Util-Methods.patch index 200c0d7726..8ef278900e 100644 --- a/Spigot-Server-Patches/0067-Add-World-Util-Methods.patch +++ b/Spigot-Server-Patches/0067-Add-World-Util-Methods.patch @@ -1,4 +1,4 @@ -From e2d2f4b4ebf96707ab1a22497ee67cc6ab677c85 Mon Sep 17 00:00:00 2001 +From aece7b7b4a5fc896c011e16a3bd56c1878038c79 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/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java -index 879a49192..d246970d3 100644 +index 9b65972569..fba176745f 100644 --- a/src/main/java/net/minecraft/server/Chunk.java +++ b/src/main/java/net/minecraft/server/Chunk.java @@ -371,6 +371,7 @@ public class Chunk implements IChunkAccess { @@ -18,7 +18,7 @@ index 879a49192..d246970d3 100644 return this.a(blockposition, i, this.world.getWorldProvider().g()); } diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index 373d08b23..e43b1d27c 100644 +index 9d10caea4a..b4147d05d1 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -46,7 +46,7 @@ public abstract class World implements IIBlockAccess, GeneratorAccess, AutoClose @@ -86,7 +86,7 @@ index 373d08b23..e43b1d27c 100644 return this.getChunkAt(blockposition.getX() >> 4, blockposition.getZ() >> 4); } diff --git a/src/main/java/net/minecraft/server/WorldBorder.java b/src/main/java/net/minecraft/server/WorldBorder.java -index 94d1c2be1..77b805f3a 100644 +index 94d1c2be11..77b805f3ae 100644 --- a/src/main/java/net/minecraft/server/WorldBorder.java +++ b/src/main/java/net/minecraft/server/WorldBorder.java @@ -19,6 +19,7 @@ public class WorldBorder { diff --git a/Spigot-Server-Patches/0068-Custom-replacement-for-eaten-items.patch b/Spigot-Server-Patches/0068-Custom-replacement-for-eaten-items.patch index abdd77258e..9aff0218e3 100644 --- a/Spigot-Server-Patches/0068-Custom-replacement-for-eaten-items.patch +++ b/Spigot-Server-Patches/0068-Custom-replacement-for-eaten-items.patch @@ -1,11 +1,11 @@ -From 0d0e34bbb0282b8bb7f911eedf00ba9a1caf768e Mon Sep 17 00:00:00 2001 +From fe4133ce0df9e28adb89be53c23e760162924883 Mon Sep 17 00:00:00 2001 From: Jedediah Smith Date: Sun, 21 Jun 2015 15:07:20 -0400 Subject: [PATCH] Custom replacement for eaten items diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java -index 0c771aec2a..ba218dd3a0 100644 +index d6475338b5..4409588fbb 100644 --- a/src/main/java/net/minecraft/server/EntityLiving.java +++ b/src/main/java/net/minecraft/server/EntityLiving.java @@ -2817,12 +2817,13 @@ public abstract class EntityLiving extends Entity { diff --git a/Spigot-Server-Patches/0069-handle-NaN-health-absorb-values-and-repair-bad-data.patch b/Spigot-Server-Patches/0069-handle-NaN-health-absorb-values-and-repair-bad-data.patch index db92d7bd4b..264c6b8876 100644 --- a/Spigot-Server-Patches/0069-handle-NaN-health-absorb-values-and-repair-bad-data.patch +++ b/Spigot-Server-Patches/0069-handle-NaN-health-absorb-values-and-repair-bad-data.patch @@ -1,11 +1,11 @@ -From dcc2fe3577794119848a6ed896e8ce5fa4634558 Mon Sep 17 00:00:00 2001 +From d7141716ce9b628a4e7c78521bb7c6c1129849b9 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sun, 27 Sep 2015 01:18:02 -0400 Subject: [PATCH] handle NaN health/absorb values and repair bad data diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java -index ba218dd3a0..0349554fc3 100644 +index 4409588fbb..d202d3d65f 100644 --- a/src/main/java/net/minecraft/server/EntityLiving.java +++ b/src/main/java/net/minecraft/server/EntityLiving.java @@ -543,7 +543,13 @@ public abstract class EntityLiving extends Entity { diff --git a/Spigot-Server-Patches/0070-Waving-banner-workaround.patch b/Spigot-Server-Patches/0070-Waving-banner-workaround.patch index 4646fe81fb..766878795a 100644 --- a/Spigot-Server-Patches/0070-Waving-banner-workaround.patch +++ b/Spigot-Server-Patches/0070-Waving-banner-workaround.patch @@ -1,4 +1,4 @@ -From c2b00d2f93744e3232037ca1352a107d31a08a07 Mon Sep 17 00:00:00 2001 +From b33d026f7e57d41740cc33b6c43ebfc299ae2f83 Mon Sep 17 00:00:00 2001 From: Gabscap Date: Sat, 19 Mar 2016 22:25:11 +0100 Subject: [PATCH] Waving banner workaround @@ -6,7 +6,7 @@ Subject: [PATCH] Waving banner workaround This patch is a workaround for MC-63720 diff --git a/src/main/java/net/minecraft/server/PacketPlayOutUpdateTime.java b/src/main/java/net/minecraft/server/PacketPlayOutUpdateTime.java -index 88c3d7efa..15af5927f 100644 +index 88c3d7efaf..15af5927f3 100644 --- a/src/main/java/net/minecraft/server/PacketPlayOutUpdateTime.java +++ b/src/main/java/net/minecraft/server/PacketPlayOutUpdateTime.java @@ -4,7 +4,13 @@ import java.io.IOException; diff --git a/Spigot-Server-Patches/0071-Use-a-Shared-Random-for-Entities.patch b/Spigot-Server-Patches/0071-Use-a-Shared-Random-for-Entities.patch index b007ec5675..c97454d552 100644 --- a/Spigot-Server-Patches/0071-Use-a-Shared-Random-for-Entities.patch +++ b/Spigot-Server-Patches/0071-Use-a-Shared-Random-for-Entities.patch @@ -1,4 +1,4 @@ -From 1790da3e00864266af558508ed1f31980376431a Mon Sep 17 00:00:00 2001 +From 741dd01bf7ce8471e5ed832e85934b867eba5433 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 da9971445..e6e47bc57 100644 +index 3d739c4316..ec57b0ad8f 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java @@ -54,6 +54,20 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke diff --git a/Spigot-Server-Patches/0072-Configurable-spawn-chances-for-skeleton-horses.patch b/Spigot-Server-Patches/0072-Configurable-spawn-chances-for-skeleton-horses.patch index 9d96555ce3..c1c0adb903 100644 --- a/Spigot-Server-Patches/0072-Configurable-spawn-chances-for-skeleton-horses.patch +++ b/Spigot-Server-Patches/0072-Configurable-spawn-chances-for-skeleton-horses.patch @@ -1,11 +1,11 @@ -From 58a7c942ae705408bddb86fc850ab3ff78922459 Mon Sep 17 00:00:00 2001 +From 489f9729ddae47bfaa1aeb774edb2981016540b0 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 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index 98049567f..2a71381da 100644 +index 98049567f4..2a71381dae 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java @@ -221,4 +221,12 @@ public class PaperWorldConfig { @@ -22,7 +22,7 @@ index 98049567f..2a71381da 100644 + } } diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java -index 999a67ebf..727faa35d 100644 +index 7b78946ece..6328558975 100644 --- a/src/main/java/net/minecraft/server/WorldServer.java +++ b/src/main/java/net/minecraft/server/WorldServer.java @@ -388,7 +388,7 @@ public class WorldServer extends World { diff --git a/Spigot-Server-Patches/0073-Optimize-isValidLocation-getType-and-getBlockData-fo.patch b/Spigot-Server-Patches/0073-Optimize-isValidLocation-getType-and-getBlockData-fo.patch index 7a8a124f23..d7d37a1a16 100644 --- a/Spigot-Server-Patches/0073-Optimize-isValidLocation-getType-and-getBlockData-fo.patch +++ b/Spigot-Server-Patches/0073-Optimize-isValidLocation-getType-and-getBlockData-fo.patch @@ -1,4 +1,4 @@ -From 4079f60167fbb6d4e223df14d2e925f6e3ab52f8 Mon Sep 17 00:00:00 2001 +From 8a0e2c5422ac005f4e87c9ffa74ed19b5bdeca1f 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 2852a17f2..7cb46d7a9 100644 +index 2852a17f23..7cb46d7a9c 100644 --- a/src/main/java/net/minecraft/server/BaseBlockPosition.java +++ b/src/main/java/net/minecraft/server/BaseBlockPosition.java @@ -10,6 +10,14 @@ public class BaseBlockPosition implements Comparable { @@ -31,7 +31,7 @@ index 2852a17f2..7cb46d7a9 100644 public BaseBlockPosition(int i, int j, int k) { this.a = i; diff --git a/src/main/java/net/minecraft/server/BlockPosition.java b/src/main/java/net/minecraft/server/BlockPosition.java -index c927d524a..64700b97c 100644 +index b56a044b3a..edd60a3d7f 100644 --- a/src/main/java/net/minecraft/server/BlockPosition.java +++ b/src/main/java/net/minecraft/server/BlockPosition.java @@ -339,6 +339,16 @@ public class BlockPosition extends BaseBlockPosition implements MinecraftSeriali @@ -52,7 +52,7 @@ index c927d524a..64700b97c 100644 public MutableBlockPosition() { this(0, 0, 0); diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java -index d246970d3..c211f8a43 100644 +index fba176745f..d06e8dbc11 100644 --- a/src/main/java/net/minecraft/server/Chunk.java +++ b/src/main/java/net/minecraft/server/Chunk.java @@ -203,12 +203,24 @@ public class Chunk implements IChunkAccess { @@ -85,7 +85,7 @@ index d246970d3..c211f8a43 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 30701fd7f..43f75fc83 100644 +index 30701fd7f3..43f75fc837 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 { @@ -98,7 +98,7 @@ index 30701fd7f..43f75fc83 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 e43b1d27c..6e655d292 100644 +index b4147d05d1..74c1beb4b8 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -197,11 +197,11 @@ public abstract class World implements IIBlockAccess, GeneratorAccess, AutoClose diff --git a/Spigot-Server-Patches/0074-Access-items-by-EquipmentSlot.patch b/Spigot-Server-Patches/0074-Access-items-by-EquipmentSlot.patch index b0c930a526..674126970e 100644 --- a/Spigot-Server-Patches/0074-Access-items-by-EquipmentSlot.patch +++ b/Spigot-Server-Patches/0074-Access-items-by-EquipmentSlot.patch @@ -1,11 +1,11 @@ -From f8ae5f908eb52e91c30ce1ed041c6f285d865bd1 Mon Sep 17 00:00:00 2001 +From de0ee29db1ba53e5aaa8bda90c17cd33c86698db Mon Sep 17 00:00:00 2001 From: Jedediah Smith Date: Sun, 20 Mar 2016 06:45:01 -0400 Subject: [PATCH] Access items by EquipmentSlot diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryPlayer.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryPlayer.java -index 5873b7623..ef4cd7a7b 100644 +index 5873b76236..ef4cd7a7b6 100644 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryPlayer.java @@ -268,4 +268,54 @@ public class CraftInventoryPlayer extends CraftInventory implements org.bukkit.i diff --git a/Spigot-Server-Patches/0075-Only-process-BlockPhysicsEvent-if-a-plugin-has-a-lis.patch b/Spigot-Server-Patches/0075-Only-process-BlockPhysicsEvent-if-a-plugin-has-a-lis.patch index ac75df3de9..d662d75bdd 100644 --- a/Spigot-Server-Patches/0075-Only-process-BlockPhysicsEvent-if-a-plugin-has-a-lis.patch +++ b/Spigot-Server-Patches/0075-Only-process-BlockPhysicsEvent-if-a-plugin-has-a-lis.patch @@ -1,4 +1,4 @@ -From c0e39a8677454538f878b96e74207423a901a128 Mon Sep 17 00:00:00 2001 +From 038989166dcaa17be17fd644d232f7f77da00a46 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 @@ -6,7 +6,7 @@ Subject: [PATCH] Only process BlockPhysicsEvent if a plugin has a listener Saves on some object allocation and processing when no plugin listens to this diff --git a/src/main/java/net/minecraft/server/BlockPlant.java b/src/main/java/net/minecraft/server/BlockPlant.java -index 9bf42bb5e..0526af776 100644 +index 9bf42bb5ef..0526af776d 100644 --- a/src/main/java/net/minecraft/server/BlockPlant.java +++ b/src/main/java/net/minecraft/server/BlockPlant.java @@ -16,7 +16,7 @@ public class BlockPlant extends Block { @@ -19,7 +19,7 @@ index 9bf42bb5e..0526af776 100644 } } diff --git a/src/main/java/net/minecraft/server/BlockTallPlant.java b/src/main/java/net/minecraft/server/BlockTallPlant.java -index 469a3be05..f2c429f22 100644 +index 469a3be057..f2c429f22e 100644 --- a/src/main/java/net/minecraft/server/BlockTallPlant.java +++ b/src/main/java/net/minecraft/server/BlockTallPlant.java @@ -55,7 +55,7 @@ public class BlockTallPlant extends BlockPlant { @@ -32,7 +32,7 @@ index 469a3be05..f2c429f22 100644 } // CraftBukkit end diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 454e28fc4..40b9bff98 100644 +index 454e28fc47..40b9bff98f 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -1096,6 +1096,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant { diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index 6e655d292..7f0a338d6 100644 +index 74c1beb4b8..7e5ebb5ba4 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -444,7 +444,7 @@ public abstract class World implements IIBlockAccess, GeneratorAccess, AutoClose @@ -66,7 +66,7 @@ index 6e655d292..7f0a338d6 100644 this.getServer().getPluginManager().callEvent(event); diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java -index 727faa35d..7c3d2d5de 100644 +index 6328558975..4568336f11 100644 --- a/src/main/java/net/minecraft/server/WorldServer.java +++ b/src/main/java/net/minecraft/server/WorldServer.java @@ -68,6 +68,7 @@ public class WorldServer extends World { diff --git a/Spigot-Server-Patches/0076-Entity-AddTo-RemoveFrom-World-Events.patch b/Spigot-Server-Patches/0076-Entity-AddTo-RemoveFrom-World-Events.patch index b8a3e1b650..07d77c9fd2 100644 --- a/Spigot-Server-Patches/0076-Entity-AddTo-RemoveFrom-World-Events.patch +++ b/Spigot-Server-Patches/0076-Entity-AddTo-RemoveFrom-World-Events.patch @@ -1,11 +1,11 @@ -From 4180858f1bda0a6d9a5f2fe1212d31d34db35d1e Mon Sep 17 00:00:00 2001 +From fd7dd6801d0da54e55b46da2047e62591dcebc53 Mon Sep 17 00:00:00 2001 From: Aikar Date: Mon, 28 Mar 2016 20:32:58 -0400 Subject: [PATCH] Entity AddTo/RemoveFrom World Events diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java -index 7c3d2d5de..2128b0bdb 100644 +index 4568336f11..9f7258ad62 100644 --- a/src/main/java/net/minecraft/server/WorldServer.java +++ b/src/main/java/net/minecraft/server/WorldServer.java @@ -1101,6 +1101,7 @@ public class WorldServer extends World { diff --git a/Spigot-Server-Patches/0077-Configurable-Chunk-Inhabited-Time.patch b/Spigot-Server-Patches/0077-Configurable-Chunk-Inhabited-Time.patch index 0ef7c21b74..867bff0b4e 100644 --- a/Spigot-Server-Patches/0077-Configurable-Chunk-Inhabited-Time.patch +++ b/Spigot-Server-Patches/0077-Configurable-Chunk-Inhabited-Time.patch @@ -1,4 +1,4 @@ -From 9650da6eae43cdd50b0fb1086daeb4df3587d5e4 Mon Sep 17 00:00:00 2001 +From bd33c4954994f308311c45d878fe7bdb05213873 Mon Sep 17 00:00:00 2001 From: Aikar Date: Mon, 28 Mar 2016 20:46:14 -0400 Subject: [PATCH] Configurable Chunk Inhabited Time diff --git a/Spigot-Server-Patches/0078-EntityPathfindEvent.patch b/Spigot-Server-Patches/0078-EntityPathfindEvent.patch index c954de19d8..3c0a8ce446 100644 --- a/Spigot-Server-Patches/0078-EntityPathfindEvent.patch +++ b/Spigot-Server-Patches/0078-EntityPathfindEvent.patch @@ -1,4 +1,4 @@ -From aa0a77d89b5675a2c87c70e049f44ca6ef1c2933 Mon Sep 17 00:00:00 2001 +From fe5186f8d8deb55a44e66f3a3bfb3dad13973e51 Mon Sep 17 00:00:00 2001 From: Aikar Date: Mon, 28 Mar 2016 21:22:26 -0400 Subject: [PATCH] EntityPathfindEvent @@ -6,7 +6,7 @@ Subject: [PATCH] EntityPathfindEvent Fires when an Entity decides to start moving to a location. diff --git a/src/main/java/net/minecraft/server/Navigation.java b/src/main/java/net/minecraft/server/Navigation.java -index aacaecd82..bc30e3f33 100644 +index aacaecd82d..bc30e3f339 100644 --- a/src/main/java/net/minecraft/server/Navigation.java +++ b/src/main/java/net/minecraft/server/Navigation.java @@ -60,7 +60,7 @@ public class Navigation extends NavigationAbstract { @@ -19,7 +19,7 @@ index aacaecd82..bc30e3f33 100644 private int s() { diff --git a/src/main/java/net/minecraft/server/NavigationAbstract.java b/src/main/java/net/minecraft/server/NavigationAbstract.java -index 75e01c242..d04eb1bbf 100644 +index 75e01c2420..d04eb1bbfe 100644 --- a/src/main/java/net/minecraft/server/NavigationAbstract.java +++ b/src/main/java/net/minecraft/server/NavigationAbstract.java @@ -4,7 +4,7 @@ import javax.annotation.Nullable; @@ -79,7 +79,7 @@ index 75e01c242..d04eb1bbf 100644 float f = this.i(); diff --git a/src/main/java/net/minecraft/server/NavigationFlying.java b/src/main/java/net/minecraft/server/NavigationFlying.java -index 9dfca6067..551ff417b 100644 +index 9dfca6067f..551ff417bd 100644 --- a/src/main/java/net/minecraft/server/NavigationFlying.java +++ b/src/main/java/net/minecraft/server/NavigationFlying.java @@ -25,7 +25,7 @@ public class NavigationFlying extends NavigationAbstract { diff --git a/Spigot-Server-Patches/0079-Reduce-IO-ops-opening-a-new-region-file.patch b/Spigot-Server-Patches/0079-Reduce-IO-ops-opening-a-new-region-file.patch index a9f8f37055..e2395ef8de 100644 --- a/Spigot-Server-Patches/0079-Reduce-IO-ops-opening-a-new-region-file.patch +++ b/Spigot-Server-Patches/0079-Reduce-IO-ops-opening-a-new-region-file.patch @@ -1,11 +1,11 @@ -From 076e36b75d9d6dde7bc0bec57f7c4690b00d4e01 Mon Sep 17 00:00:00 2001 +From 8d21454a2da311f15d053e1d87030a8d621eef5c Mon Sep 17 00:00:00 2001 From: Antony Riley Date: Tue, 29 Mar 2016 06:56:23 +0300 Subject: [PATCH] Reduce IO ops opening a new region file. diff --git a/src/main/java/net/minecraft/server/RegionFile.java b/src/main/java/net/minecraft/server/RegionFile.java -index b062a31c4..4e6288e8b 100644 +index b062a31c49..4e6288e8bb 100644 --- a/src/main/java/net/minecraft/server/RegionFile.java +++ b/src/main/java/net/minecraft/server/RegionFile.java @@ -26,7 +26,7 @@ public class RegionFile implements AutoCloseable { diff --git a/Spigot-Server-Patches/0080-Sanitise-RegionFileCache-and-make-configurable.patch b/Spigot-Server-Patches/0080-Sanitise-RegionFileCache-and-make-configurable.patch index 9071845d8d..57fb028f9f 100644 --- a/Spigot-Server-Patches/0080-Sanitise-RegionFileCache-and-make-configurable.patch +++ b/Spigot-Server-Patches/0080-Sanitise-RegionFileCache-and-make-configurable.patch @@ -1,4 +1,4 @@ -From a2f127354ee26af4318bd046748e69dc6caa3d94 Mon Sep 17 00:00:00 2001 +From ee9729fff3b8e42a8c65e88dd84f803d3105f818 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. diff --git a/Spigot-Server-Patches/0081-Use-Optimized-Collections.patch b/Spigot-Server-Patches/0081-Use-Optimized-Collections.patch index b18f65f2b8..141d5ed557 100644 --- a/Spigot-Server-Patches/0081-Use-Optimized-Collections.patch +++ b/Spigot-Server-Patches/0081-Use-Optimized-Collections.patch @@ -1,4 +1,4 @@ -From 1b2ad4e733c58626160941b5719277e1e96e6a3a Mon Sep 17 00:00:00 2001 +From 5eaf48c01d7ee5b9f3f19b41a86e33e21ec530c9 Mon Sep 17 00:00:00 2001 From: Aikar Date: Wed, 30 Mar 2016 02:13:24 -0400 Subject: [PATCH] Use Optimized Collections @@ -13,7 +13,7 @@ These collections are super fast as seen http://java-performance.info/hashmap-overview-jdk-fastutil-goldman-sachs-hppc-koloboke-trove-january-2015/ diff --git a/src/main/java/net/minecraft/server/DataWatcher.java b/src/main/java/net/minecraft/server/DataWatcher.java -index 79a240cd1..f224043d8 100644 +index 79a240cd1d..f224043d8e 100644 --- a/src/main/java/net/minecraft/server/DataWatcher.java +++ b/src/main/java/net/minecraft/server/DataWatcher.java @@ -12,6 +12,7 @@ import java.util.Map; diff --git a/Spigot-Server-Patches/0082-Do-not-load-chunks-for-Pathfinding.patch b/Spigot-Server-Patches/0082-Do-not-load-chunks-for-Pathfinding.patch index e1e40476ec..36052b1e19 100644 --- a/Spigot-Server-Patches/0082-Do-not-load-chunks-for-Pathfinding.patch +++ b/Spigot-Server-Patches/0082-Do-not-load-chunks-for-Pathfinding.patch @@ -1,11 +1,11 @@ -From de7967b2d83901afe71ae8e0ca85ea9fe2dd5f7e Mon Sep 17 00:00:00 2001 +From 8d5305f585c5fac05ca991aab11157fef4249202 Mon Sep 17 00:00:00 2001 From: Aikar Date: Thu, 31 Mar 2016 19:17:58 -0400 Subject: [PATCH] Do not load chunks for Pathfinding diff --git a/src/main/java/net/minecraft/server/ChunkCache.java b/src/main/java/net/minecraft/server/ChunkCache.java -index ccbc1dde0..34e743716 100644 +index ccbc1dde09..34e743716b 100644 --- a/src/main/java/net/minecraft/server/ChunkCache.java +++ b/src/main/java/net/minecraft/server/ChunkCache.java @@ -25,7 +25,7 @@ public class ChunkCache implements IWorldReader { @@ -27,7 +27,7 @@ index ccbc1dde0..34e743716 100644 @Override diff --git a/src/main/java/net/minecraft/server/NavigationAbstract.java b/src/main/java/net/minecraft/server/NavigationAbstract.java -index d04eb1bbf..ed69eaa17 100644 +index d04eb1bbfe..ed69eaa176 100644 --- a/src/main/java/net/minecraft/server/NavigationAbstract.java +++ b/src/main/java/net/minecraft/server/NavigationAbstract.java @@ -22,7 +22,7 @@ public abstract class NavigationAbstract { @@ -40,7 +40,7 @@ index d04eb1bbf..ed69eaa17 100644 public NavigationAbstract(EntityInsentient entityinsentient, World world) { this.g = Vec3D.a; diff --git a/src/main/java/net/minecraft/server/Pathfinder.java b/src/main/java/net/minecraft/server/Pathfinder.java -index 359d9a11c..262fa5585 100644 +index 359d9a11c0..262fa55850 100644 --- a/src/main/java/net/minecraft/server/Pathfinder.java +++ b/src/main/java/net/minecraft/server/Pathfinder.java @@ -12,7 +12,7 @@ public class Pathfinder { @@ -53,7 +53,7 @@ index 359d9a11c..262fa5585 100644 public Pathfinder(PathfinderAbstract pathfinderabstract, int i) { this.e = pathfinderabstract; diff --git a/src/main/java/net/minecraft/server/PathfinderNormal.java b/src/main/java/net/minecraft/server/PathfinderNormal.java -index d97166f8f..0cea9db8f 100644 +index d97166f8f0..0cea9db8f5 100644 --- a/src/main/java/net/minecraft/server/PathfinderNormal.java +++ b/src/main/java/net/minecraft/server/PathfinderNormal.java @@ -355,7 +355,8 @@ public class PathfinderNormal extends PathfinderAbstract { diff --git a/Spigot-Server-Patches/0083-Do-not-load-chunks-for-light-checks.patch b/Spigot-Server-Patches/0083-Do-not-load-chunks-for-light-checks.patch index 8abfddbac8..fd864e1f1e 100644 --- a/Spigot-Server-Patches/0083-Do-not-load-chunks-for-light-checks.patch +++ b/Spigot-Server-Patches/0083-Do-not-load-chunks-for-light-checks.patch @@ -1,4 +1,4 @@ -From 4351b6a0dab9bf16220548ab518e2734eee48cdf Mon Sep 17 00:00:00 2001 +From 2d3ae802f90e7c88c39ec5fd10860b582b938bd6 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 light checks @@ -7,7 +7,7 @@ Should only happen for blocks on the edge that uses neighbors light level (certain blocks). In that case, there will be 3-4 other neighbors to get a light level from. diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index 7f0a338d6..8ad4fbff2 100644 +index 7e5ebb5ba4..4db49d6cdb 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -596,6 +596,7 @@ public abstract class World implements IIBlockAccess, GeneratorAccess, AutoClose diff --git a/Spigot-Server-Patches/0084-Add-PlayerUseUnknownEntityEvent.patch b/Spigot-Server-Patches/0084-Add-PlayerUseUnknownEntityEvent.patch index 149fa3c35b..57a6567d33 100644 --- a/Spigot-Server-Patches/0084-Add-PlayerUseUnknownEntityEvent.patch +++ b/Spigot-Server-Patches/0084-Add-PlayerUseUnknownEntityEvent.patch @@ -1,4 +1,4 @@ -From 7b55abf7aa63e8eec74cb9f7c07747630e64cca3 Mon Sep 17 00:00:00 2001 +From 477282fb61e8af4709e4091479a7135185cfd269 Mon Sep 17 00:00:00 2001 From: Jedediah Smith Date: Sat, 2 Apr 2016 05:09:16 -0400 Subject: [PATCH] Add PlayerUseUnknownEntityEvent diff --git a/Spigot-Server-Patches/0085-Fix-reducedDebugInfo-not-initialized-on-client.patch b/Spigot-Server-Patches/0085-Fix-reducedDebugInfo-not-initialized-on-client.patch index e8e98e0ae4..983ff5754e 100644 --- a/Spigot-Server-Patches/0085-Fix-reducedDebugInfo-not-initialized-on-client.patch +++ b/Spigot-Server-Patches/0085-Fix-reducedDebugInfo-not-initialized-on-client.patch @@ -1,11 +1,11 @@ -From 423787829587edb5a7bc9e77c238e30fd4429051 Mon Sep 17 00:00:00 2001 +From 489acc1d125db2286438df948a45a3cf727437a3 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 b647e4287..5745b4762 100644 +index 9390ac96fa..25ef32dc92 100644 --- a/src/main/java/net/minecraft/server/PlayerList.java +++ b/src/main/java/net/minecraft/server/PlayerList.java @@ -162,6 +162,7 @@ public abstract class PlayerList { diff --git a/Spigot-Server-Patches/0086-Configurable-Grass-Spread-Tick-Rate.patch b/Spigot-Server-Patches/0086-Configurable-Grass-Spread-Tick-Rate.patch index 916353d9bb..901ae72c6e 100644 --- a/Spigot-Server-Patches/0086-Configurable-Grass-Spread-Tick-Rate.patch +++ b/Spigot-Server-Patches/0086-Configurable-Grass-Spread-Tick-Rate.patch @@ -1,11 +1,11 @@ -From 0bffb82c7e47d00fe30082cfcac8505fe6df2efa Mon Sep 17 00:00:00 2001 +From 123f680395350c8ca1e0abd157c156975988f098 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sun, 3 Apr 2016 16:28:17 -0400 Subject: [PATCH] Configurable Grass Spread Tick Rate diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index e43866991..59d11e68c 100644 +index e43866991c..59d11e68c9 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java @@ -244,4 +244,10 @@ public class PaperWorldConfig { @@ -20,7 +20,7 @@ index e43866991..59d11e68c 100644 + } } diff --git a/src/main/java/net/minecraft/server/BlockDirtSnowSpreadable.java b/src/main/java/net/minecraft/server/BlockDirtSnowSpreadable.java -index ddca19b46..377a57c89 100644 +index ddca19b46b..377a57c89a 100644 --- a/src/main/java/net/minecraft/server/BlockDirtSnowSpreadable.java +++ b/src/main/java/net/minecraft/server/BlockDirtSnowSpreadable.java @@ -29,6 +29,7 @@ public abstract class BlockDirtSnowSpreadable extends BlockDirtSnow { diff --git a/Spigot-Server-Patches/0087-Fix-Cancelling-BlockPlaceEvent-triggering-physics.patch b/Spigot-Server-Patches/0087-Fix-Cancelling-BlockPlaceEvent-triggering-physics.patch index 37d7a9e972..3f4dbf9169 100644 --- a/Spigot-Server-Patches/0087-Fix-Cancelling-BlockPlaceEvent-triggering-physics.patch +++ b/Spigot-Server-Patches/0087-Fix-Cancelling-BlockPlaceEvent-triggering-physics.patch @@ -1,11 +1,11 @@ -From 3335c20b0b739ccc047c731f9fb718c525f104a5 Mon Sep 17 00:00:00 2001 +From e0a746fc2f95bf124958446d2fc83da64b51b428 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sun, 3 Apr 2016 17:48:50 -0400 Subject: [PATCH] Fix Cancelling BlockPlaceEvent triggering physics diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index 8ad4fbff2..b5e8de64c 100644 +index 4db49d6cdb..136b8bba56 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -514,6 +514,7 @@ public abstract class World implements IIBlockAccess, GeneratorAccess, AutoClose diff --git a/Spigot-Server-Patches/0088-Remove-Debug-checks-from-DataBits.patch b/Spigot-Server-Patches/0088-Remove-Debug-checks-from-DataBits.patch index 51798bf77c..e5d9708ef8 100644 --- a/Spigot-Server-Patches/0088-Remove-Debug-checks-from-DataBits.patch +++ b/Spigot-Server-Patches/0088-Remove-Debug-checks-from-DataBits.patch @@ -1,4 +1,4 @@ -From 084a4779bd54e0678d3fabfdef2cc0ffa55d5dc0 Mon Sep 17 00:00:00 2001 +From 77d15adf005868ece6b2c312f29eb172f7610d1a 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 @@ -9,7 +9,7 @@ Before: http://i.imgur.com/nQsMzAE.png After: http://i.imgur.com/nJ46crB.png diff --git a/src/main/java/net/minecraft/server/DataBits.java b/src/main/java/net/minecraft/server/DataBits.java -index 409dc837c..4194acc8b 100644 +index 409dc837c6..4194acc8b9 100644 --- a/src/main/java/net/minecraft/server/DataBits.java +++ b/src/main/java/net/minecraft/server/DataBits.java @@ -14,7 +14,7 @@ public class DataBits { diff --git a/Spigot-Server-Patches/0089-Option-to-use-vanilla-per-world-scoreboard-coloring-.patch b/Spigot-Server-Patches/0089-Option-to-use-vanilla-per-world-scoreboard-coloring-.patch index 5eb1897783..25603ab3fb 100644 --- a/Spigot-Server-Patches/0089-Option-to-use-vanilla-per-world-scoreboard-coloring-.patch +++ b/Spigot-Server-Patches/0089-Option-to-use-vanilla-per-world-scoreboard-coloring-.patch @@ -1,4 +1,4 @@ -From 5b423d4184ce9e20835e17744e6915e204dab4da Mon Sep 17 00:00:00 2001 +From b85581b8f8c3150fbe284551404e0970b38876ed Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Wed, 6 Apr 2016 01:04:23 -0500 Subject: [PATCH] Option to use vanilla per-world scoreboard coloring on names diff --git a/Spigot-Server-Patches/0090-Workaround-for-setting-passengers-on-players.patch b/Spigot-Server-Patches/0090-Workaround-for-setting-passengers-on-players.patch index a465ce7f28..a73a6abb3d 100644 --- a/Spigot-Server-Patches/0090-Workaround-for-setting-passengers-on-players.patch +++ b/Spigot-Server-Patches/0090-Workaround-for-setting-passengers-on-players.patch @@ -1,4 +1,4 @@ -From 921fa8d6156b4f6f71eb2e8a26f42b0b33590a97 Mon Sep 17 00:00:00 2001 +From 76094a87a75e2c9210e92725976841980c3ccb23 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 3e1a7be6f..3d37f78c6 100644 +index 3e1a7be6f3..3d37f78c62 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -754,6 +754,17 @@ public class CraftPlayer extends CraftHumanEntity implements Player { diff --git a/Spigot-Server-Patches/0091-Remove-unused-World-Tile-Entity-List.patch b/Spigot-Server-Patches/0091-Remove-unused-World-Tile-Entity-List.patch index 9141ec1e9a..e1d4310f8f 100644 --- a/Spigot-Server-Patches/0091-Remove-unused-World-Tile-Entity-List.patch +++ b/Spigot-Server-Patches/0091-Remove-unused-World-Tile-Entity-List.patch @@ -1,4 +1,4 @@ -From c6aa46f0deebd8097a0dcfe516819d6eb10ea6f5 Mon Sep 17 00:00:00 2001 +From e06d6176687c54b2792da16762ac441320389025 Mon Sep 17 00:00:00 2001 From: Aikar Date: Wed, 13 Apr 2016 00:25:28 -0400 Subject: [PATCH] Remove unused World Tile Entity List @@ -6,7 +6,7 @@ Subject: [PATCH] Remove unused World Tile Entity List Massive hit to performance and it is completely unnecessary. diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index b5e8de64c..aaf22401b 100644 +index 136b8bba56..0688f9afa0 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -40,7 +40,7 @@ public abstract class World implements IIBlockAccess, GeneratorAccess, AutoClose diff --git a/Spigot-Server-Patches/0092-Don-t-tick-Skulls-unused-code.patch b/Spigot-Server-Patches/0092-Don-t-tick-Skulls-unused-code.patch index fd4038ccf9..4456b4fc4a 100644 --- a/Spigot-Server-Patches/0092-Don-t-tick-Skulls-unused-code.patch +++ b/Spigot-Server-Patches/0092-Don-t-tick-Skulls-unused-code.patch @@ -1,11 +1,11 @@ -From 11c7c6634e7b82a3515a1b481131f2350f411e12 Mon Sep 17 00:00:00 2001 +From 9fa2dd5be9d01a9e33d16e1ad49dc1e53e57c19f 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 diff --git a/src/main/java/net/minecraft/server/TileEntitySkull.java b/src/main/java/net/minecraft/server/TileEntitySkull.java -index 369fdfe67..f6a80a00f 100644 +index 99442bb130..177cceb77f 100644 --- a/src/main/java/net/minecraft/server/TileEntitySkull.java +++ b/src/main/java/net/minecraft/server/TileEntitySkull.java @@ -24,7 +24,7 @@ import com.mojang.authlib.ProfileLookupCallback; diff --git a/Spigot-Server-Patches/0093-Configurable-Player-Collision.patch b/Spigot-Server-Patches/0093-Configurable-Player-Collision.patch index cf72763164..1b826b3748 100644 --- a/Spigot-Server-Patches/0093-Configurable-Player-Collision.patch +++ b/Spigot-Server-Patches/0093-Configurable-Player-Collision.patch @@ -1,11 +1,11 @@ -From f51bf643eca9dd327d7b778f7815b838bbbb718b Mon Sep 17 00:00:00 2001 +From aa89645da6d38486cf09d144ec49baa833978295 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 4424f7ef1..69bfe6241 100644 +index 4424f7ef18..69bfe62416 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 4424f7ef1..69bfe6241 100644 + } } diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 40b9bff98..7a860231e 100644 +index 40b9bff98f..7a860231e4 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -439,6 +439,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 diff --git a/Spigot-Server-Patches/0095-Configurable-RCON-IP-address.patch b/Spigot-Server-Patches/0095-Configurable-RCON-IP-address.patch index fbbea2710b..07f4b846a7 100644 --- a/Spigot-Server-Patches/0095-Configurable-RCON-IP-address.patch +++ b/Spigot-Server-Patches/0095-Configurable-RCON-IP-address.patch @@ -1,4 +1,4 @@ -From 357d0968b4557fbeee33afad9f1bf4953bfe5f97 Mon Sep 17 00:00:00 2001 +From b43c4f717a6ad9f503368c2fe69f545c5519710b Mon Sep 17 00:00:00 2001 From: Aikar Date: Sat, 16 Apr 2016 00:39:33 -0400 Subject: [PATCH] Configurable RCON IP address @@ -6,7 +6,7 @@ Subject: [PATCH] Configurable RCON IP address For servers with multiple IP's, ability to bind to a specific interface. diff --git a/src/main/java/net/minecraft/server/DedicatedServerProperties.java b/src/main/java/net/minecraft/server/DedicatedServerProperties.java -index 4af81c886..fb092a941 100644 +index 4af81c8866..fb092a9416 100644 --- a/src/main/java/net/minecraft/server/DedicatedServerProperties.java +++ b/src/main/java/net/minecraft/server/DedicatedServerProperties.java @@ -53,6 +53,8 @@ public class DedicatedServerProperties extends PropertyManager> { @@ -45,7 +45,7 @@ index d7e81a6d9..729455ce5 100644 } diff --git a/src/main/java/net/minecraft/server/RemoteControlListener.java b/src/main/java/net/minecraft/server/RemoteControlListener.java -index e48d6dcd7..2ce490be0 100644 +index e48d6dcd74..2ce490be00 100644 --- a/src/main/java/net/minecraft/server/RemoteControlListener.java +++ b/src/main/java/net/minecraft/server/RemoteControlListener.java @@ -25,7 +25,7 @@ public class RemoteControlListener extends RemoteConnectionThread { diff --git a/Spigot-Server-Patches/0096-Prevent-Fire-from-loading-chunks.patch b/Spigot-Server-Patches/0096-Prevent-Fire-from-loading-chunks.patch index 2d99c5be2f..f9f9048967 100644 --- a/Spigot-Server-Patches/0096-Prevent-Fire-from-loading-chunks.patch +++ b/Spigot-Server-Patches/0096-Prevent-Fire-from-loading-chunks.patch @@ -1,4 +1,4 @@ -From d1efa6bba3cdff2f808b7cd9b23710bda0bc1e31 Mon Sep 17 00:00:00 2001 +From a9018b9be33068e8efa58683c7c9b1202dc03fea 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 8645a0ebd..f769df41a 100644 +index 8645a0ebd0..f769df41a6 100644 --- a/src/main/java/net/minecraft/server/BlockFire.java +++ b/src/main/java/net/minecraft/server/BlockFire.java @@ -163,6 +163,7 @@ public class BlockFire extends Block { diff --git a/Spigot-Server-Patches/0097-Implement-PlayerLocaleChangeEvent.patch b/Spigot-Server-Patches/0097-Implement-PlayerLocaleChangeEvent.patch index 2da4e1c172..59687f4d08 100644 --- a/Spigot-Server-Patches/0097-Implement-PlayerLocaleChangeEvent.patch +++ b/Spigot-Server-Patches/0097-Implement-PlayerLocaleChangeEvent.patch @@ -1,11 +1,11 @@ -From cbe0c2d48c13bface4e60be80356287705e5c9c9 Mon Sep 17 00:00:00 2001 +From 296be4130a85f05881063a33bd3674e9678e4c63 Mon Sep 17 00:00:00 2001 From: Isaac Moore Date: Tue, 19 Apr 2016 14:09:31 -0500 Subject: [PATCH] Implement PlayerLocaleChangeEvent diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java -index 7eaef7f6b..beb16c8d5 100644 +index a385035748..052fccc7a9 100644 --- a/src/main/java/net/minecraft/server/EntityPlayer.java +++ b/src/main/java/net/minecraft/server/EntityPlayer.java @@ -37,7 +37,7 @@ import org.bukkit.inventory.MainHand; @@ -40,7 +40,7 @@ index 7eaef7f6b..beb16c8d5 100644 this.cl = packetplayinsettings.e(); this.getDataWatcher().set(EntityPlayer.bt, (byte) packetplayinsettings.f()); diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index 3d37f78c6..eca8c0ded 100644 +index 3d37f78c62..eca8c0ded9 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -1748,8 +1748,10 @@ public class CraftPlayer extends CraftHumanEntity implements Player { diff --git a/Spigot-Server-Patches/0098-EntityRegainHealthEvent-isFastRegen-API.patch b/Spigot-Server-Patches/0098-EntityRegainHealthEvent-isFastRegen-API.patch index 7889749701..de93a2d495 100644 --- a/Spigot-Server-Patches/0098-EntityRegainHealthEvent-isFastRegen-API.patch +++ b/Spigot-Server-Patches/0098-EntityRegainHealthEvent-isFastRegen-API.patch @@ -1,4 +1,4 @@ -From ef8955e4430de17f8d1836abe4eef3f446da957e Mon Sep 17 00:00:00 2001 +From 3c8c351655b79f30358e0550080a62baf7a76b61 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 0349554fc3..12286beda9 100644 +index d202d3d65f..5622c08f19 100644 --- a/src/main/java/net/minecraft/server/EntityLiving.java +++ b/src/main/java/net/minecraft/server/EntityLiving.java @@ -969,10 +969,16 @@ public abstract class EntityLiving extends Entity { diff --git a/Spigot-Server-Patches/0099-Add-ability-to-configure-frosted_ice-properties.patch b/Spigot-Server-Patches/0099-Add-ability-to-configure-frosted_ice-properties.patch index 539815181d..390f876b91 100644 --- a/Spigot-Server-Patches/0099-Add-ability-to-configure-frosted_ice-properties.patch +++ b/Spigot-Server-Patches/0099-Add-ability-to-configure-frosted_ice-properties.patch @@ -1,11 +1,11 @@ -From ec727fb21a703427442c7ec6646cb2f95ef36eb4 Mon Sep 17 00:00:00 2001 +From 84f4961f6a940ea15a9b3f59a9eca13dc775400d Mon Sep 17 00:00:00 2001 From: kashike Date: Thu, 21 Apr 2016 23:51:55 -0700 Subject: [PATCH] Add ability to configure frosted_ice properties diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index 1da7ffab5..377f4983b 100644 +index 1da7ffab5d..377f4983b7 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java @@ -255,4 +255,14 @@ public class PaperWorldConfig { @@ -24,7 +24,7 @@ index 1da7ffab5..377f4983b 100644 + } } diff --git a/src/main/java/net/minecraft/server/BlockIceFrost.java b/src/main/java/net/minecraft/server/BlockIceFrost.java -index 1a0c2eeaa..39c3bbc9c 100644 +index 1a0c2eeaa4..39c3bbc9cf 100644 --- a/src/main/java/net/minecraft/server/BlockIceFrost.java +++ b/src/main/java/net/minecraft/server/BlockIceFrost.java @@ -13,6 +13,7 @@ public class BlockIceFrost extends BlockIce { diff --git a/Spigot-Server-Patches/0100-remove-null-possibility-for-getServer-singleton.patch b/Spigot-Server-Patches/0100-remove-null-possibility-for-getServer-singleton.patch index 90e271163f..b5bfeab7cb 100644 --- a/Spigot-Server-Patches/0100-remove-null-possibility-for-getServer-singleton.patch +++ b/Spigot-Server-Patches/0100-remove-null-possibility-for-getServer-singleton.patch @@ -1,4 +1,4 @@ -From 8d4d0568b508b622988c62ecd54d1565f9e03b53 Mon Sep 17 00:00:00 2001 +From 4743c0d1eb42f6520a10b8021c1a018ab6a5a9e7 Mon Sep 17 00:00:00 2001 From: Aikar Date: Thu, 28 Apr 2016 00:57:27 -0400 Subject: [PATCH] remove null possibility for getServer singleton @@ -6,7 +6,7 @@ Subject: [PATCH] remove null possibility for getServer singleton to stop IDE complaining about potential NPE diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 7a860231e..d3d8fffeb 100644 +index 7a860231e4..d3d8fffeb0 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -61,6 +61,7 @@ import co.aikar.timings.MinecraftTimings; // Paper diff --git a/Spigot-Server-Patches/0101-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch b/Spigot-Server-Patches/0101-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch index 40f6eeb5a1..55c56ec2e2 100644 --- a/Spigot-Server-Patches/0101-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch +++ b/Spigot-Server-Patches/0101-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch @@ -1,4 +1,4 @@ -From 00f68187d3129ddb2d4cd71db286a1f72d9e11b2 Mon Sep 17 00:00:00 2001 +From 0df50044df8df2e5c23c2092b7dd8bc45ea5d43f 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 51dcb5ff0..7143ec7bb 100644 +index 418e2fccdc..892922ca63 100644 --- a/src/main/java/net/minecraft/server/EntityHuman.java +++ b/src/main/java/net/minecraft/server/EntityHuman.java @@ -590,6 +590,12 @@ public abstract class EntityHuman extends EntityLiving { @@ -30,7 +30,7 @@ index 51dcb5ff0..7143ec7bb 100644 return entityitem; } diff --git a/src/main/java/net/minecraft/server/WorldMap.java b/src/main/java/net/minecraft/server/WorldMap.java -index 61892fec9..acbd381c8 100644 +index 61892fec98..acbd381c8c 100644 --- a/src/main/java/net/minecraft/server/WorldMap.java +++ b/src/main/java/net/minecraft/server/WorldMap.java @@ -31,6 +31,7 @@ public class WorldMap extends PersistentBase { @@ -102,7 +102,7 @@ index 61892fec9..acbd381c8 100644 for ( org.bukkit.map.MapCursor cursor : render.cursors) { diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java -index 2128b0bdb..2cb70b3bc 100644 +index 9f7258ad62..d69ad6820b 100644 --- a/src/main/java/net/minecraft/server/WorldServer.java +++ b/src/main/java/net/minecraft/server/WorldServer.java @@ -1038,6 +1038,7 @@ public class WorldServer extends World { @@ -114,7 +114,7 @@ index 2128b0bdb..2cb70b3bc 100644 } } diff --git a/src/main/java/org/bukkit/craftbukkit/map/RenderData.java b/src/main/java/org/bukkit/craftbukkit/map/RenderData.java -index 256a13178..5768cd512 100644 +index 256a131781..5768cd512e 100644 --- a/src/main/java/org/bukkit/craftbukkit/map/RenderData.java +++ b/src/main/java/org/bukkit/craftbukkit/map/RenderData.java @@ -5,7 +5,7 @@ import org.bukkit.map.MapCursor; diff --git a/Spigot-Server-Patches/0102-LootTable-API-Replenishable-Lootables-Feature.patch b/Spigot-Server-Patches/0102-LootTable-API-Replenishable-Lootables-Feature.patch index 1385e84179..2b7a847661 100644 --- a/Spigot-Server-Patches/0102-LootTable-API-Replenishable-Lootables-Feature.patch +++ b/Spigot-Server-Patches/0102-LootTable-API-Replenishable-Lootables-Feature.patch @@ -1,4 +1,4 @@ -From 304fee7282682c00a09783f4bec4874865dbb149 Mon Sep 17 00:00:00 2001 +From a3895fc06ee4f2f44bc4ddbb58f9643c42d52c99 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 @@ -11,7 +11,7 @@ This feature is good for long term worlds so that newer players do not suffer with "Every chest has been looted" diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index 377f4983b..805aa5699 100644 +index 377f4983b7..805aa56999 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java @@ -265,4 +265,26 @@ public class PaperWorldConfig { @@ -43,7 +43,7 @@ index 377f4983b..805aa5699 100644 } diff --git a/src/main/java/com/destroystokyo/paper/loottable/PaperLootableBlockInventory.java b/src/main/java/com/destroystokyo/paper/loottable/PaperLootableBlockInventory.java new file mode 100644 -index 000000000..d6fce3112 +index 0000000000..d6fce3112e --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/loottable/PaperLootableBlockInventory.java @@ -0,0 +1,33 @@ @@ -82,7 +82,7 @@ index 000000000..d6fce3112 +} diff --git a/src/main/java/com/destroystokyo/paper/loottable/PaperLootableEntityInventory.java b/src/main/java/com/destroystokyo/paper/loottable/PaperLootableEntityInventory.java new file mode 100644 -index 000000000..5e637782d +index 0000000000..5e637782d5 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/loottable/PaperLootableEntityInventory.java @@ -0,0 +1,28 @@ @@ -116,7 +116,7 @@ index 000000000..5e637782d +} diff --git a/src/main/java/com/destroystokyo/paper/loottable/PaperLootableInventory.java b/src/main/java/com/destroystokyo/paper/loottable/PaperLootableInventory.java new file mode 100644 -index 000000000..856843fc9 +index 0000000000..856843fc91 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/loottable/PaperLootableInventory.java @@ -0,0 +1,71 @@ @@ -193,7 +193,7 @@ index 000000000..856843fc9 +} diff --git a/src/main/java/com/destroystokyo/paper/loottable/PaperLootableInventoryData.java b/src/main/java/com/destroystokyo/paper/loottable/PaperLootableInventoryData.java new file mode 100644 -index 000000000..b5401eaf9 +index 0000000000..b5401eaf97 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/loottable/PaperLootableInventoryData.java @@ -0,0 +1,179 @@ @@ -378,7 +378,7 @@ index 000000000..b5401eaf9 +} diff --git a/src/main/java/com/destroystokyo/paper/loottable/PaperMinecartLootableInventory.java b/src/main/java/com/destroystokyo/paper/loottable/PaperMinecartLootableInventory.java new file mode 100644 -index 000000000..f9fbc221b +index 0000000000..f9fbc221bd --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/loottable/PaperMinecartLootableInventory.java @@ -0,0 +1,64 @@ @@ -448,7 +448,7 @@ index 000000000..f9fbc221b +} diff --git a/src/main/java/com/destroystokyo/paper/loottable/PaperTileEntityLootableInventory.java b/src/main/java/com/destroystokyo/paper/loottable/PaperTileEntityLootableInventory.java new file mode 100644 -index 000000000..d50410532 +index 0000000000..d50410532c --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/loottable/PaperTileEntityLootableInventory.java @@ -0,0 +1,67 @@ @@ -520,7 +520,7 @@ index 000000000..d50410532 + } +} diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java -index ec57b0ad8..1cc7b9f60 100644 +index ec57b0ad8f..1cc7b9f60e 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java @@ -72,6 +72,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke @@ -532,7 +532,7 @@ index ec57b0ad8..1cc7b9f60 100644 public CraftEntity getBukkitEntity() { diff --git a/src/main/java/net/minecraft/server/EntityMinecartContainer.java b/src/main/java/net/minecraft/server/EntityMinecartContainer.java -index 66826da45..b84a70edb 100644 +index 66826da450..b84a70edb4 100644 --- a/src/main/java/net/minecraft/server/EntityMinecartContainer.java +++ b/src/main/java/net/minecraft/server/EntityMinecartContainer.java @@ -15,10 +15,11 @@ public abstract class EntityMinecartContainer extends EntityMinecartAbstract imp @@ -591,7 +591,7 @@ index 66826da45..b84a70edb 100644 if (entityhuman != null) { diff --git a/src/main/java/net/minecraft/server/TileEntityLootable.java b/src/main/java/net/minecraft/server/TileEntityLootable.java -index 56c7f9b4e..a12d49fc4 100644 +index 56c7f9b4e3..a12d49fc4d 100644 --- a/src/main/java/net/minecraft/server/TileEntityLootable.java +++ b/src/main/java/net/minecraft/server/TileEntityLootable.java @@ -6,8 +6,9 @@ import javax.annotation.Nullable; @@ -646,7 +646,7 @@ index 56c7f9b4e..a12d49fc4 100644 if (entityhuman != null) { diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftBlockEntityState.java b/src/main/java/org/bukkit/craftbukkit/block/CraftBlockEntityState.java -index 57443ca6f..d8b3d2f3d 100644 +index 57443ca6f0..d8b3d2f3d5 100644 --- a/src/main/java/org/bukkit/craftbukkit/block/CraftBlockEntityState.java +++ b/src/main/java/org/bukkit/craftbukkit/block/CraftBlockEntityState.java @@ -65,7 +65,7 @@ public class CraftBlockEntityState extends CraftBlockState @@ -659,7 +659,7 @@ index 57443ca6f..d8b3d2f3d 100644 } diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftChest.java b/src/main/java/org/bukkit/craftbukkit/block/CraftChest.java -index 6beb99262..019fa7118 100644 +index 6beb992622..019fa71181 100644 --- a/src/main/java/org/bukkit/craftbukkit/block/CraftChest.java +++ b/src/main/java/org/bukkit/craftbukkit/block/CraftChest.java @@ -11,8 +11,9 @@ import org.bukkit.craftbukkit.CraftWorld; @@ -674,7 +674,7 @@ index 6beb99262..019fa7118 100644 public CraftChest(final Block block) { super(block, TileEntityChest.class); diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftLootable.java b/src/main/java/org/bukkit/craftbukkit/block/CraftLootable.java -index e1ad26a24..678aa09d4 100644 +index e1ad26a242..678aa09d47 100644 --- a/src/main/java/org/bukkit/craftbukkit/block/CraftLootable.java +++ b/src/main/java/org/bukkit/craftbukkit/block/CraftLootable.java @@ -1,5 +1,6 @@ @@ -703,7 +703,7 @@ index e1ad26a24..678aa09d4 100644 getSnapshot().setLootTable(key, seed); } diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftMinecartChest.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftMinecartChest.java -index e05624e64..ab4807b2c 100644 +index e05624e643..ab4807b2cd 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftMinecartChest.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftMinecartChest.java @@ -1,5 +1,6 @@ @@ -723,7 +723,7 @@ index e05624e64..ab4807b2c 100644 public CraftMinecartChest(CraftServer server, EntityMinecartChest entity) { diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftMinecartContainer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftMinecartContainer.java -index 2d776b520..fcc978784 100644 +index 2d776b520b..fcc9787848 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftMinecartContainer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftMinecartContainer.java @@ -47,7 +47,7 @@ public abstract class CraftMinecartContainer extends CraftMinecart implements Lo @@ -736,7 +736,7 @@ index 2d776b520..fcc978784 100644 getHandle().setLootTable(newKey, seed); } diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftMinecartHopper.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftMinecartHopper.java -index 334bd5bb3..f5b31237f 100644 +index 334bd5bb3f..f5b31237fc 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftMinecartHopper.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftMinecartHopper.java @@ -1,5 +1,6 @@ diff --git a/Spigot-Server-Patches/0103-Don-t-save-empty-scoreboard-teams-to-scoreboard.dat.patch b/Spigot-Server-Patches/0103-Don-t-save-empty-scoreboard-teams-to-scoreboard.dat.patch index a992145ace..5bfcb569ae 100644 --- a/Spigot-Server-Patches/0103-Don-t-save-empty-scoreboard-teams-to-scoreboard.dat.patch +++ b/Spigot-Server-Patches/0103-Don-t-save-empty-scoreboard-teams-to-scoreboard.dat.patch @@ -1,11 +1,11 @@ -From 955ba66f8ecfc4ccf127afcb2d30c4a9f3aac8e6 Mon Sep 17 00:00:00 2001 +From 387cc76a0ab3f782fca151ef039cbf5ad9b409b8 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 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java -index 69bfe6241..20b04e120 100644 +index 69bfe62416..20b04e120f 100644 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java @@ -228,4 +228,9 @@ public class PaperConfig { @@ -19,7 +19,7 @@ index 69bfe6241..20b04e120 100644 + } } diff --git a/src/main/java/net/minecraft/server/PersistentScoreboard.java b/src/main/java/net/minecraft/server/PersistentScoreboard.java -index fab5962e2..de7ac6c20 100644 +index fab5962e2a..de7ac6c205 100644 --- a/src/main/java/net/minecraft/server/PersistentScoreboard.java +++ b/src/main/java/net/minecraft/server/PersistentScoreboard.java @@ -174,6 +174,7 @@ public class PersistentScoreboard extends PersistentBase { diff --git a/Spigot-Server-Patches/0104-System-property-for-disabling-watchdoge.patch b/Spigot-Server-Patches/0104-System-property-for-disabling-watchdoge.patch index eb3dd8e351..b09e1fbc75 100644 --- a/Spigot-Server-Patches/0104-System-property-for-disabling-watchdoge.patch +++ b/Spigot-Server-Patches/0104-System-property-for-disabling-watchdoge.patch @@ -1,11 +1,11 @@ -From 882090b6eebab75df8847daedb5734d500c5b360 Mon Sep 17 00:00:00 2001 +From 23eacc2aa2794bb3a1c00d8ad9f0546dd1772a08 Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Thu, 12 May 2016 23:02:58 -0500 Subject: [PATCH] System property for disabling watchdoge diff --git a/src/main/java/org/spigotmc/WatchdogThread.java b/src/main/java/org/spigotmc/WatchdogThread.java -index 56f5f54bd..9532aada8 100644 +index 56f5f54bd1..9532aada82 100644 --- a/src/main/java/org/spigotmc/WatchdogThread.java +++ b/src/main/java/org/spigotmc/WatchdogThread.java @@ -57,7 +57,7 @@ public class WatchdogThread extends Thread diff --git a/Spigot-Server-Patches/0105-Optimize-UserCache-Thread-Safe.patch b/Spigot-Server-Patches/0105-Optimize-UserCache-Thread-Safe.patch index 7a4db84695..291352d40d 100644 --- a/Spigot-Server-Patches/0105-Optimize-UserCache-Thread-Safe.patch +++ b/Spigot-Server-Patches/0105-Optimize-UserCache-Thread-Safe.patch @@ -1,4 +1,4 @@ -From aea94acb32f7d201b505e3e46a382a3b9c0256b2 Mon Sep 17 00:00:00 2001 +From af563ef14dd92ec6b20188467057a8358420e08e 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 d3d8fffeb..f142ed9a3 100644 +index d3d8fffeb0..f142ed9a3b 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -739,7 +739,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant Date: Mon, 16 May 2016 23:19:16 -0400 Subject: [PATCH] Avoid blocking on Network Manager creation @@ -6,7 +6,7 @@ Subject: [PATCH] Avoid blocking on Network Manager creation Per Paper issue 294 diff --git a/src/main/java/net/minecraft/server/ServerConnection.java b/src/main/java/net/minecraft/server/ServerConnection.java -index 42c654a1d..e7ed6af9c 100644 +index 42c654a1da..e7ed6af9cb 100644 --- a/src/main/java/net/minecraft/server/ServerConnection.java +++ b/src/main/java/net/minecraft/server/ServerConnection.java @@ -39,6 +39,15 @@ public class ServerConnection { diff --git a/Spigot-Server-Patches/0107-Optional-TNT-doesn-t-move-in-water.patch b/Spigot-Server-Patches/0107-Optional-TNT-doesn-t-move-in-water.patch index b041c674ef..c2db41eb6b 100644 --- a/Spigot-Server-Patches/0107-Optional-TNT-doesn-t-move-in-water.patch +++ b/Spigot-Server-Patches/0107-Optional-TNT-doesn-t-move-in-water.patch @@ -1,11 +1,11 @@ -From 523f9eced01289baf9441ed3e84169bcd9b3769e Mon Sep 17 00:00:00 2001 +From 577ba9ef52f25e26f4c01fadd609e081c61c8d74 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/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index 805aa5699..92ab55182 100644 +index 805aa56999..92ab55182f 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java @@ -2,7 +2,6 @@ package com.destroystokyo.paper; @@ -32,7 +32,7 @@ index 805aa5699..92ab55182 100644 + } } diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java -index 202ad9489..d017cc8e6 100644 +index 1cc7b9f60e..4ef333ef12 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java @@ -2645,6 +2645,12 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke @@ -49,7 +49,7 @@ index 202ad9489..d017cc8e6 100644 } diff --git a/src/main/java/net/minecraft/server/EntityTNTPrimed.java b/src/main/java/net/minecraft/server/EntityTNTPrimed.java -index e0535604b..baeb85142 100644 +index e0535604b6..baeb85142b 100644 --- a/src/main/java/net/minecraft/server/EntityTNTPrimed.java +++ b/src/main/java/net/minecraft/server/EntityTNTPrimed.java @@ -80,7 +80,27 @@ public class EntityTNTPrimed extends Entity { @@ -94,7 +94,7 @@ index e0535604b..baeb85142 100644 + // Paper end } diff --git a/src/main/java/net/minecraft/server/EntityTrackerEntry.java b/src/main/java/net/minecraft/server/EntityTrackerEntry.java -index aaf3a54b0..afd8748da 100644 +index aaf3a54b08..afd8748da8 100644 --- a/src/main/java/net/minecraft/server/EntityTrackerEntry.java +++ b/src/main/java/net/minecraft/server/EntityTrackerEntry.java @@ -36,7 +36,7 @@ public class EntityTrackerEntry { diff --git a/Spigot-Server-Patches/0108-Faster-redstone-torch-rapid-clock-removal.patch b/Spigot-Server-Patches/0108-Faster-redstone-torch-rapid-clock-removal.patch index 7299c6fd17..0a093265eb 100644 --- a/Spigot-Server-Patches/0108-Faster-redstone-torch-rapid-clock-removal.patch +++ b/Spigot-Server-Patches/0108-Faster-redstone-torch-rapid-clock-removal.patch @@ -1,4 +1,4 @@ -From 98afb383d2043af399ac01b60a988d9975b83ef9 Mon Sep 17 00:00:00 2001 +From ad5a252ab8118d682cd38acd1d82c07add7f4c4d 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 @@ -6,7 +6,7 @@ Subject: [PATCH] Faster redstone torch rapid clock removal Only resize the the redstone torch list once, since resizing arrays / lists is costly diff --git a/src/main/java/net/minecraft/server/BlockRedstoneTorch.java b/src/main/java/net/minecraft/server/BlockRedstoneTorch.java -index a99f979ef..919ba8a14 100644 +index a99f979eff..919ba8a14d 100644 --- a/src/main/java/net/minecraft/server/BlockRedstoneTorch.java +++ b/src/main/java/net/minecraft/server/BlockRedstoneTorch.java @@ -11,7 +11,7 @@ import org.bukkit.event.block.BlockRedstoneEvent; // CraftBukkit @@ -77,7 +77,7 @@ index a99f979ef..919ba8a14 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 aaf22401b..de0b07b5a 100644 +index 0688f9afa0..663dd7df43 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -99,6 +99,7 @@ public abstract class World implements IIBlockAccess, GeneratorAccess, AutoClose diff --git a/Spigot-Server-Patches/0109-Add-server-name-parameter.patch b/Spigot-Server-Patches/0109-Add-server-name-parameter.patch index 4b0579a661..8983d90ba7 100644 --- a/Spigot-Server-Patches/0109-Add-server-name-parameter.patch +++ b/Spigot-Server-Patches/0109-Add-server-name-parameter.patch @@ -1,11 +1,11 @@ -From b84a4c4ef5f5a3860860eb96092dc6c1eb6ee025 Mon Sep 17 00:00:00 2001 +From 758aa8854a6f7f3470bcdd022e3226d283e8c2dc 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 7f5ea764d..c5d5121fd 100644 +index 7f5ea764d7..c5d5121fd9 100644 --- a/src/main/java/org/bukkit/craftbukkit/Main.java +++ b/src/main/java/org/bukkit/craftbukkit/Main.java @@ -136,6 +136,14 @@ public class Main { diff --git a/Spigot-Server-Patches/0110-Only-send-Dragon-Wither-Death-sounds-to-same-world.patch b/Spigot-Server-Patches/0110-Only-send-Dragon-Wither-Death-sounds-to-same-world.patch index c2577940f3..3cb2a43df4 100644 --- a/Spigot-Server-Patches/0110-Only-send-Dragon-Wither-Death-sounds-to-same-world.patch +++ b/Spigot-Server-Patches/0110-Only-send-Dragon-Wither-Death-sounds-to-same-world.patch @@ -1,4 +1,4 @@ -From a03786f6ca15361611bb799cfd4eadc26bacd533 Mon Sep 17 00:00:00 2001 +From e70e23f1b4097a6bfcae1475bc5d88baa7f53f52 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 @@ -6,7 +6,7 @@ Subject: [PATCH] Only send Dragon/Wither Death sounds to same world Also fix view distance lookup diff --git a/src/main/java/net/minecraft/server/EntityEnderDragon.java b/src/main/java/net/minecraft/server/EntityEnderDragon.java -index 291845be1..b3010bee5 100644 +index 015918e3b3..6ac0546029 100644 --- a/src/main/java/net/minecraft/server/EntityEnderDragon.java +++ b/src/main/java/net/minecraft/server/EntityEnderDragon.java @@ -563,8 +563,11 @@ public class EntityEnderDragon extends EntityInsentient implements IMonster { @@ -24,7 +24,7 @@ index 291845be1..b3010bee5 100644 double deltaZ = this.locZ - player.locZ; double distanceSquared = deltaX * deltaX + deltaZ * deltaZ; diff --git a/src/main/java/net/minecraft/server/EntityWither.java b/src/main/java/net/minecraft/server/EntityWither.java -index f23f09430..48b22894a 100644 +index de6c70e3e7..e3feb39ad0 100644 --- a/src/main/java/net/minecraft/server/EntityWither.java +++ b/src/main/java/net/minecraft/server/EntityWither.java @@ -207,8 +207,11 @@ public class EntityWither extends EntityMonster implements IRangedEntity { diff --git a/Spigot-Server-Patches/0111-Fix-Double-World-Add-issues.patch b/Spigot-Server-Patches/0111-Fix-Double-World-Add-issues.patch index 2516133a7e..f6e9feb6a5 100644 --- a/Spigot-Server-Patches/0111-Fix-Double-World-Add-issues.patch +++ b/Spigot-Server-Patches/0111-Fix-Double-World-Add-issues.patch @@ -1,4 +1,4 @@ -From 34e636a557db00e823e4b1ce139507410c999fe2 Mon Sep 17 00:00:00 2001 +From 2bcd271e4d04b952a82877dd1591a6d3555edae2 Mon Sep 17 00:00:00 2001 From: Aikar Date: Tue, 21 Jun 2016 22:54:34 -0400 Subject: [PATCH] Fix Double World Add issues @@ -8,7 +8,7 @@ Vanilla will double add Spider Jockeys to the world, so ignore already added. Also add debug if something else tries to, and abort before world gets bad state diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java -index 2cb70b3bc..ec392deca 100644 +index d69ad6820b..f03804bfbb 100644 --- a/src/main/java/net/minecraft/server/WorldServer.java +++ b/src/main/java/net/minecraft/server/WorldServer.java @@ -928,6 +928,7 @@ public class WorldServer extends World { diff --git a/Spigot-Server-Patches/0112-Fix-Old-Sign-Conversion.patch b/Spigot-Server-Patches/0112-Fix-Old-Sign-Conversion.patch index 5d7b9ff76a..d9f4439d05 100644 --- a/Spigot-Server-Patches/0112-Fix-Old-Sign-Conversion.patch +++ b/Spigot-Server-Patches/0112-Fix-Old-Sign-Conversion.patch @@ -1,4 +1,4 @@ -From 3a3725fb8e7c10867e2f89ffd36c334843303d37 Mon Sep 17 00:00:00 2001 +From e644cfc450205877a1eb466f2283d9ddbe9a6414 Mon Sep 17 00:00:00 2001 From: Aikar Date: Fri, 17 Jun 2016 20:50:11 -0400 Subject: [PATCH] Fix Old Sign Conversion @@ -9,7 +9,7 @@ Subject: [PATCH] Fix Old Sign Conversion This causes Igloos and such to render broken signs. We fix this by ignoring sign conversion for Defined Structures diff --git a/src/main/java/net/minecraft/server/DefinedStructure.java b/src/main/java/net/minecraft/server/DefinedStructure.java -index 1e81c49bf..297f868d6 100644 +index dff181f1c2..9868677f67 100644 --- a/src/main/java/net/minecraft/server/DefinedStructure.java +++ b/src/main/java/net/minecraft/server/DefinedStructure.java @@ -203,9 +203,11 @@ public class DefinedStructure { @@ -25,7 +25,7 @@ index 1e81c49bf..297f868d6 100644 } diff --git a/src/main/java/net/minecraft/server/TileEntity.java b/src/main/java/net/minecraft/server/TileEntity.java -index b99bcbf8a..013745f82 100644 +index 1307152997..35574a5ef3 100644 --- a/src/main/java/net/minecraft/server/TileEntity.java +++ b/src/main/java/net/minecraft/server/TileEntity.java @@ -20,6 +20,7 @@ public abstract class TileEntity implements KeyedObject { // Paper @@ -37,7 +37,7 @@ index b99bcbf8a..013745f82 100644 @Nullable protected World world; diff --git a/src/main/java/net/minecraft/server/TileEntitySign.java b/src/main/java/net/minecraft/server/TileEntitySign.java -index 86d0b18f7..626ba9b17 100644 +index a8f0aae9ea..2c6ce5bae0 100644 --- a/src/main/java/net/minecraft/server/TileEntitySign.java +++ b/src/main/java/net/minecraft/server/TileEntitySign.java @@ -58,13 +58,14 @@ public class TileEntitySign extends TileEntity implements ICommandListener { // diff --git a/Spigot-Server-Patches/0113-Don-t-lookup-game-profiles-that-have-no-UUID-and-no-.patch b/Spigot-Server-Patches/0113-Don-t-lookup-game-profiles-that-have-no-UUID-and-no-.patch index 2d68dd1041..f9ded51421 100644 --- a/Spigot-Server-Patches/0113-Don-t-lookup-game-profiles-that-have-no-UUID-and-no-.patch +++ b/Spigot-Server-Patches/0113-Don-t-lookup-game-profiles-that-have-no-UUID-and-no-.patch @@ -1,4 +1,4 @@ -From db2d448fb90f6e5a39f6f465553944f4bf4bc8a0 Mon Sep 17 00:00:00 2001 +From efcdf1631aee883b11b9d67e2b7bab229fef53dc Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Sat, 16 Jul 2016 19:11:17 -0500 Subject: [PATCH] Don't lookup game profiles that have no UUID and no name diff --git a/Spigot-Server-Patches/0114-More-informative-vehicle-moved-wrongly-message.patch b/Spigot-Server-Patches/0114-More-informative-vehicle-moved-wrongly-message.patch index 5db06ed73e..edf7cb21a7 100644 --- a/Spigot-Server-Patches/0114-More-informative-vehicle-moved-wrongly-message.patch +++ b/Spigot-Server-Patches/0114-More-informative-vehicle-moved-wrongly-message.patch @@ -1,11 +1,11 @@ -From c3923c331319d8f793867276f2505d2c4736d3f5 Mon Sep 17 00:00:00 2001 +From 4da3d4074c44227a576d277b7df8e7229d345ee5 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 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java -index bc11a9162..be870d97a 100644 +index e88abe1d05..630059246f 100644 --- a/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java @@ -361,7 +361,7 @@ public class PlayerConnection implements PacketListenerPlayIn { diff --git a/Spigot-Server-Patches/0115-Re-track-players-that-dismount-from-other-players.patch b/Spigot-Server-Patches/0115-Re-track-players-that-dismount-from-other-players.patch index da11bcf667..268e749420 100644 --- a/Spigot-Server-Patches/0115-Re-track-players-that-dismount-from-other-players.patch +++ b/Spigot-Server-Patches/0115-Re-track-players-that-dismount-from-other-players.patch @@ -1,11 +1,11 @@ -From 043764e8d33082b85be144949a683d71601426a7 Mon Sep 17 00:00:00 2001 +From 5b570ba3ebf9b9dabb56aedf21cb2d224b7089a0 Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Sun, 31 Jul 2016 16:33:03 -0500 Subject: [PATCH] Re-track players that dismount from other players diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java -index beb16c8d5..ec1033f33 100644 +index 052fccc7a9..43827ba087 100644 --- a/src/main/java/net/minecraft/server/EntityPlayer.java +++ b/src/main/java/net/minecraft/server/EntityPlayer.java @@ -975,6 +975,14 @@ public class EntityPlayer extends EntityHuman implements ICrafting { diff --git a/Spigot-Server-Patches/0116-Add-setting-for-proxy-online-mode-status.patch b/Spigot-Server-Patches/0116-Add-setting-for-proxy-online-mode-status.patch index 34448cec7c..2257f86f98 100644 --- a/Spigot-Server-Patches/0116-Add-setting-for-proxy-online-mode-status.patch +++ b/Spigot-Server-Patches/0116-Add-setting-for-proxy-online-mode-status.patch @@ -1,11 +1,11 @@ -From d5a547237926db5bf30ee054daeff55fb6ca8987 Mon Sep 17 00:00:00 2001 +From a160b5e23ec2753ae9fe01952b5ce5902ed30326 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 20b04e120..3d9dba769 100644 +index 20b04e120f..3d9dba7696 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 20b04e120..3d9dba769 100644 + } } diff --git a/src/main/java/net/minecraft/server/NameReferencingFileConverter.java b/src/main/java/net/minecraft/server/NameReferencingFileConverter.java -index 61ea2818b..26c786106 100644 +index 21a8ed3231..0794aff5b7 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 61ea2818b..26c786106 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 954eb497b..4d51bbbec 100644 +index 86aa2ad322..d1c09b4513 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -1352,7 +1352,8 @@ public final class CraftServer implements Server { diff --git a/Spigot-Server-Patches/0117-Optimise-BlockState-s-hashCode-equals.patch b/Spigot-Server-Patches/0117-Optimise-BlockState-s-hashCode-equals.patch index b75ed0d0ba..a66f61ee61 100644 --- a/Spigot-Server-Patches/0117-Optimise-BlockState-s-hashCode-equals.patch +++ b/Spigot-Server-Patches/0117-Optimise-BlockState-s-hashCode-equals.patch @@ -1,4 +1,4 @@ -From 0ac810e61e128cfd3d657bcf5af1d1401ea1559c Mon Sep 17 00:00:00 2001 +From 1001284a525e1b93976e3397b554c3a4c78fb8db 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 77b25317a..be7e10d85 100644 +index 77b25317aa..be7e10d859 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 77b25317a..be7e10d85 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 31cb8ac84..3f085c7d6 100644 +index 31cb8ac841..3f085c7d65 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 31cb8ac84..3f085c7d6 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 59d86fc66..82a1fac6f 100644 +index 59d86fc66e..82a1fac6f1 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 59d86fc66..82a1fac6f 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 6861c2b05..74ef69952 100644 +index 6861c2b058..74ef699520 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 { diff --git a/Spigot-Server-Patches/0118-Configurable-packet-in-spam-threshold.patch b/Spigot-Server-Patches/0118-Configurable-packet-in-spam-threshold.patch index ba56db5301..2ca5197062 100644 --- a/Spigot-Server-Patches/0118-Configurable-packet-in-spam-threshold.patch +++ b/Spigot-Server-Patches/0118-Configurable-packet-in-spam-threshold.patch @@ -1,4 +1,4 @@ -From cb713b852dbd0b6765dc4c9276b466f8113329a2 Mon Sep 17 00:00:00 2001 +From 0d36264954520bce8e635f216638efc6bdb1e3cb 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/Spigot-Server-Patches/0119-Configurable-flying-kick-messages.patch b/Spigot-Server-Patches/0119-Configurable-flying-kick-messages.patch index 10ba57900d..840417ab09 100644 --- a/Spigot-Server-Patches/0119-Configurable-flying-kick-messages.patch +++ b/Spigot-Server-Patches/0119-Configurable-flying-kick-messages.patch @@ -1,11 +1,11 @@ -From 9e7b3606ca82f4d99656cabaaf202fb7a3f49844 Mon Sep 17 00:00:00 2001 +From 81248276db90e822eb0419706edce3bdb755d00f 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 5c7f17090..503e13775 100644 +index 5c7f170907..503e137750 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 5c7f17090..503e13775 100644 + } } diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java -index 8d33eb25e..3788cc37e 100644 +index fd990e703c..d2c178429d 100644 --- a/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java @@ -144,7 +144,7 @@ public class PlayerConnection implements PacketListenerPlayIn { diff --git a/Spigot-Server-Patches/0120-Chunk-registration-fixes.patch b/Spigot-Server-Patches/0120-Chunk-registration-fixes.patch index ae19bafc42..460de9c378 100644 --- a/Spigot-Server-Patches/0120-Chunk-registration-fixes.patch +++ b/Spigot-Server-Patches/0120-Chunk-registration-fixes.patch @@ -1,4 +1,4 @@ -From 259a5fd0b7e29174666b9cdb1fb6083bede2b275 Mon Sep 17 00:00:00 2001 +From d2fb1b0c1f1ae7fe4e52422cf581fe4c172d1cbe 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 ec392deca..9fdc8f5b0 100644 +index f03804bfbb..ebd1ff1d50 100644 --- a/src/main/java/net/minecraft/server/WorldServer.java +++ b/src/main/java/net/minecraft/server/WorldServer.java @@ -624,7 +624,7 @@ public class WorldServer extends World { diff --git a/Spigot-Server-Patches/0121-Remove-FishingHook-reference-on-Craft-Entity-removal.patch b/Spigot-Server-Patches/0121-Remove-FishingHook-reference-on-Craft-Entity-removal.patch index 7c3765b088..10048733cc 100644 --- a/Spigot-Server-Patches/0121-Remove-FishingHook-reference-on-Craft-Entity-removal.patch +++ b/Spigot-Server-Patches/0121-Remove-FishingHook-reference-on-Craft-Entity-removal.patch @@ -1,11 +1,11 @@ -From 06525d170c7d03336b3e760d1b5f03094219896f Mon Sep 17 00:00:00 2001 +From a4c8d47cb7d433491adbb5289165f5940b592169 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 1ed9a4e32..9eb980137 100644 +index 1ed9a4e32e..9eb9801376 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 { diff --git a/Spigot-Server-Patches/0122-Auto-fix-bad-Y-levels-on-player-login.patch b/Spigot-Server-Patches/0122-Auto-fix-bad-Y-levels-on-player-login.patch index e89db2a7b0..30c02d98ad 100644 --- a/Spigot-Server-Patches/0122-Auto-fix-bad-Y-levels-on-player-login.patch +++ b/Spigot-Server-Patches/0122-Auto-fix-bad-Y-levels-on-player-login.patch @@ -1,4 +1,4 @@ -From cdebeb72ea6b44cd8feb612a6b0d39301822a4f2 Mon Sep 17 00:00:00 2001 +From 11c2fdaa7ce9519c578c7f93572d32ebcf12c49e 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 ec1033f33..af803ae8a 100644 +index 43827ba087..e86943872d 100644 --- a/src/main/java/net/minecraft/server/EntityPlayer.java +++ b/src/main/java/net/minecraft/server/EntityPlayer.java @@ -191,6 +191,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting { diff --git a/Spigot-Server-Patches/0123-Option-to-remove-corrupt-tile-entities.patch b/Spigot-Server-Patches/0123-Option-to-remove-corrupt-tile-entities.patch index f094ef6e9b..83ba05aac4 100644 --- a/Spigot-Server-Patches/0123-Option-to-remove-corrupt-tile-entities.patch +++ b/Spigot-Server-Patches/0123-Option-to-remove-corrupt-tile-entities.patch @@ -1,11 +1,11 @@ -From fa25cf3ca7063d1bb2dd2aa78ca5f2b3067266d6 Mon Sep 17 00:00:00 2001 +From 5847823015c90d85d2a9298cb601bd913fe68fd5 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 92ab55182..eed454bf4 100644 +index 92ab55182f..eed454bf40 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java @@ -296,4 +296,9 @@ public class PaperWorldConfig { @@ -19,7 +19,7 @@ index 92ab55182..eed454bf4 100644 + } } diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java -index 2da7c4531..7bd5a0a8c 100644 +index f9b6970ae6..98c2de5507 100644 --- a/src/main/java/net/minecraft/server/Chunk.java +++ b/src/main/java/net/minecraft/server/Chunk.java @@ -533,6 +533,12 @@ public class Chunk implements IChunkAccess { diff --git a/Spigot-Server-Patches/0124-Add-EntityZapEvent.patch b/Spigot-Server-Patches/0124-Add-EntityZapEvent.patch index 5cb2aabb9f..6f8b946ceb 100644 --- a/Spigot-Server-Patches/0124-Add-EntityZapEvent.patch +++ b/Spigot-Server-Patches/0124-Add-EntityZapEvent.patch @@ -1,4 +1,4 @@ -From f695990b7b9ad58234ab33396e27100ad1bd0803 Mon Sep 17 00:00:00 2001 +From 96868514fa15ccbff2fd7d0d3e3caa81f4202d64 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/Spigot-Server-Patches/0125-Don-t-load-Chunks-from-Hoppers-and-other-things.patch b/Spigot-Server-Patches/0125-Don-t-load-Chunks-from-Hoppers-and-other-things.patch index 045dbf0fcf..30d1c5d3cc 100644 --- a/Spigot-Server-Patches/0125-Don-t-load-Chunks-from-Hoppers-and-other-things.patch +++ b/Spigot-Server-Patches/0125-Don-t-load-Chunks-from-Hoppers-and-other-things.patch @@ -1,4 +1,4 @@ -From 95acf9aa9d57511f2f8cbffc86e02862ab67a165 Mon Sep 17 00:00:00 2001 +From 8891204b820afb962d75f21f515ebe92e05d6f0a 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/BlockChest.java b/src/main/java/net/minecraft/server/BlockChest.java -index ee9d91a8c..e71178ac1 100644 +index 5fd6061f60..af18759ee4 100644 --- a/src/main/java/net/minecraft/server/BlockChest.java +++ b/src/main/java/net/minecraft/server/BlockChest.java @@ -227,7 +227,12 @@ public class BlockChest extends BlockTileEntity implements IBlockWaterlogged { diff --git a/Spigot-Server-Patches/0126-Filter-bad-data-from-ArmorStand-and-SpawnEgg-items.patch b/Spigot-Server-Patches/0126-Filter-bad-data-from-ArmorStand-and-SpawnEgg-items.patch index c606d181ce..48775c1b1d 100644 --- a/Spigot-Server-Patches/0126-Filter-bad-data-from-ArmorStand-and-SpawnEgg-items.patch +++ b/Spigot-Server-Patches/0126-Filter-bad-data-from-ArmorStand-and-SpawnEgg-items.patch @@ -1,11 +1,11 @@ -From 7e3e752ccf968eae4eec177848c194cfcd040f12 Mon Sep 17 00:00:00 2001 +From 4745becbd6a33a8e90867190097d2930527695f6 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 eed454bf4..4892113a1 100644 +index eed454bf40..4892113a15 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 eed454bf4..4892113a1 100644 + } } diff --git a/src/main/java/net/minecraft/server/EntityFallingBlock.java b/src/main/java/net/minecraft/server/EntityFallingBlock.java -index 90becdfde..f54887e5e 100644 +index 90becdfdec..f54887e5e8 100644 --- a/src/main/java/net/minecraft/server/EntityFallingBlock.java +++ b/src/main/java/net/minecraft/server/EntityFallingBlock.java @@ -224,6 +224,15 @@ public class EntityFallingBlock extends Entity { diff --git a/Spigot-Server-Patches/0127-Cache-user-authenticator-threads.patch b/Spigot-Server-Patches/0127-Cache-user-authenticator-threads.patch index d36973de0d..2148760302 100644 --- a/Spigot-Server-Patches/0127-Cache-user-authenticator-threads.patch +++ b/Spigot-Server-Patches/0127-Cache-user-authenticator-threads.patch @@ -1,11 +1,11 @@ -From d482793affe9ce0c643010d6ba5401aa1dbf331e Mon Sep 17 00:00:00 2001 +From 972f31a7b18191954dd357fca4b866f8e9b501be Mon Sep 17 00:00:00 2001 From: vemacs Date: Wed, 23 Nov 2016 08:31:45 -0500 Subject: [PATCH] Cache user authenticator threads diff --git a/src/main/java/net/minecraft/server/LoginListener.java b/src/main/java/net/minecraft/server/LoginListener.java -index b85b048ac..22d5c7d20 100644 +index b85b048ace..22d5c7d20a 100644 --- a/src/main/java/net/minecraft/server/LoginListener.java +++ b/src/main/java/net/minecraft/server/LoginListener.java @@ -92,6 +92,12 @@ public class LoginListener implements PacketLoginInListener { diff --git a/Spigot-Server-Patches/0128-Optimise-removeQueue.patch b/Spigot-Server-Patches/0128-Optimise-removeQueue.patch index 41ab66de4d..9ee4ae44bb 100644 --- a/Spigot-Server-Patches/0128-Optimise-removeQueue.patch +++ b/Spigot-Server-Patches/0128-Optimise-removeQueue.patch @@ -1,11 +1,11 @@ -From ff1320c9a7860de781f25149459b0a813b27f522 Mon Sep 17 00:00:00 2001 +From 5e39ed432eb840ce8c889a58a8cac9262c6d8a96 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/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java -index af803ae8a..46d1dddca 100644 +index e86943872d..7352ec5bb9 100644 --- a/src/main/java/net/minecraft/server/EntityPlayer.java +++ b/src/main/java/net/minecraft/server/EntityPlayer.java @@ -4,7 +4,9 @@ import com.google.common.collect.Lists; diff --git a/Spigot-Server-Patches/0129-Allow-Reloading-of-Command-Aliases.patch b/Spigot-Server-Patches/0129-Allow-Reloading-of-Command-Aliases.patch index 45d19a22bc..92b8dfe6ec 100644 --- a/Spigot-Server-Patches/0129-Allow-Reloading-of-Command-Aliases.patch +++ b/Spigot-Server-Patches/0129-Allow-Reloading-of-Command-Aliases.patch @@ -1,4 +1,4 @@ -From 96ac123f0471183403f26b720fa88bc266f7a03b Mon Sep 17 00:00:00 2001 +From 93208f52723359bceb3b6efd115a822ac298f15d 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 4d51bbbec..e79ea322a 100644 +index d1c09b4513..56fa5a7b8a 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -2062,5 +2062,24 @@ public final class CraftServer implements Server { diff --git a/Spigot-Server-Patches/0130-Add-source-to-PlayerExpChangeEvent.patch b/Spigot-Server-Patches/0130-Add-source-to-PlayerExpChangeEvent.patch index 951f486485..a467f2d37e 100644 --- a/Spigot-Server-Patches/0130-Add-source-to-PlayerExpChangeEvent.patch +++ b/Spigot-Server-Patches/0130-Add-source-to-PlayerExpChangeEvent.patch @@ -1,4 +1,4 @@ -From cea0a916ca0d6d05c6ae4e120095df1bd3fa0c25 Mon Sep 17 00:00:00 2001 +From c3fd94b522008f7bddfc228002c0350ddbc5775c 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/Spigot-Server-Patches/0131-Optimize-World.isLoaded-BlockPosition-Z.patch b/Spigot-Server-Patches/0131-Optimize-World.isLoaded-BlockPosition-Z.patch index bf6c35b9a8..7ea60856af 100644 --- a/Spigot-Server-Patches/0131-Optimize-World.isLoaded-BlockPosition-Z.patch +++ b/Spigot-Server-Patches/0131-Optimize-World.isLoaded-BlockPosition-Z.patch @@ -1,4 +1,4 @@ -From 05df7e752a62f0ae70c38cd166ba265bc93aa533 Mon Sep 17 00:00:00 2001 +From e0e219891baa3c5415899c94eed4bfa40b6aa285 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 de0b07b5a..6b2769343 100644 +index 663dd7df43..34d35f4fa5 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -209,6 +209,10 @@ public abstract class World implements IIBlockAccess, GeneratorAccess, AutoClose diff --git a/Spigot-Server-Patches/0132-Don-t-let-fishinghooks-use-portals.patch b/Spigot-Server-Patches/0132-Don-t-let-fishinghooks-use-portals.patch index 85b3041830..62f30d155f 100644 --- a/Spigot-Server-Patches/0132-Don-t-let-fishinghooks-use-portals.patch +++ b/Spigot-Server-Patches/0132-Don-t-let-fishinghooks-use-portals.patch @@ -1,11 +1,11 @@ -From 36f8bbc61f94489ba77a4a775807e75b716fe735 Mon Sep 17 00:00:00 2001 +From 17f1cbcfe084e4ae8557bb1520dbb52d450bdca8 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 d017cc8e6..7700652e1 100644 +index 4ef333ef12..c5576e0325 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java @@ -156,7 +156,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke @@ -18,7 +18,7 @@ index d017cc8e6..7700652e1 100644 public DimensionManager dimension; protected BlockPosition al; diff --git a/src/main/java/net/minecraft/server/EntityFishingHook.java b/src/main/java/net/minecraft/server/EntityFishingHook.java -index 9cbcce446..3b10043ba 100644 +index 19a6233c3f..390f1a24d0 100644 --- a/src/main/java/net/minecraft/server/EntityFishingHook.java +++ b/src/main/java/net/minecraft/server/EntityFishingHook.java @@ -163,6 +163,12 @@ public class EntityFishingHook extends Entity { diff --git a/Spigot-Server-Patches/0133-Add-ProjectileCollideEvent.patch b/Spigot-Server-Patches/0133-Add-ProjectileCollideEvent.patch index e46426f2fb..7de618f052 100644 --- a/Spigot-Server-Patches/0133-Add-ProjectileCollideEvent.patch +++ b/Spigot-Server-Patches/0133-Add-ProjectileCollideEvent.patch @@ -1,11 +1,11 @@ -From 4fc2b605c619bf4e579f64850f767d97bffe21c9 Mon Sep 17 00:00:00 2001 +From 70bb9186fbb72c53d7fdd7176e75ea05a3cfa1fa 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 28fc512ba..5ee0802e0 100644 +index 28fc512bab..5ee0802e04 100644 --- a/src/main/java/net/minecraft/server/EntityArrow.java +++ b/src/main/java/net/minecraft/server/EntityArrow.java @@ -184,6 +184,16 @@ public abstract class EntityArrow extends Entity implements IProjectile { @@ -26,7 +26,7 @@ index 28fc512ba..5ee0802e0 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 faf064757..fe4e993d5 100644 +index faf0647574..fe4e993d5c 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 { @@ -48,7 +48,7 @@ index faf064757..fe4e993d5 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 390f1a24d..758559d35 100644 +index 390f1a24d0..758559d35d 100644 --- a/src/main/java/net/minecraft/server/EntityFishingHook.java +++ b/src/main/java/net/minecraft/server/EntityFishingHook.java @@ -217,7 +217,16 @@ public class EntityFishingHook extends Entity { @@ -70,7 +70,7 @@ index 390f1a24d..758559d35 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 d1710259c..5f0cb4c33 100644 +index d1710259ce..5f0cb4c33d 100644 --- a/src/main/java/net/minecraft/server/EntityProjectile.java +++ b/src/main/java/net/minecraft/server/EntityProjectile.java @@ -102,7 +102,16 @@ public abstract class EntityProjectile extends Entity implements IProjectile { @@ -92,7 +92,7 @@ index d1710259c..5f0cb4c33 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 e597f3790..224d1dbff 100644 +index e597f37903..224d1dbffc 100644 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java @@ -1114,6 +1114,16 @@ public class CraftEventFactory { diff --git a/Spigot-Server-Patches/0134-Prevent-Pathfinding-out-of-World-Border.patch b/Spigot-Server-Patches/0134-Prevent-Pathfinding-out-of-World-Border.patch index ef364ebc81..a907fed44d 100644 --- a/Spigot-Server-Patches/0134-Prevent-Pathfinding-out-of-World-Border.patch +++ b/Spigot-Server-Patches/0134-Prevent-Pathfinding-out-of-World-Border.patch @@ -1,4 +1,4 @@ -From f0e810168ea733c61409a90ff5f5bb2783326d53 Mon Sep 17 00:00:00 2001 +From cbb02b848932ae2be731c85cba1be561c6bedca2 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 ed69eaa17..a473c03b9 100644 +index ed69eaa176..a473c03b9d 100644 --- a/src/main/java/net/minecraft/server/NavigationAbstract.java +++ b/src/main/java/net/minecraft/server/NavigationAbstract.java @@ -95,6 +95,7 @@ public abstract class NavigationAbstract { diff --git a/Spigot-Server-Patches/0135-Bound-Treasure-Maps-to-World-Border.patch b/Spigot-Server-Patches/0135-Bound-Treasure-Maps-to-World-Border.patch index 7405035570..2de3b4a40e 100644 --- a/Spigot-Server-Patches/0135-Bound-Treasure-Maps-to-World-Border.patch +++ b/Spigot-Server-Patches/0135-Bound-Treasure-Maps-to-World-Border.patch @@ -1,4 +1,4 @@ -From b9c3b94962c7d88eeeb0cbc6f91f3412620ba7cf Mon Sep 17 00:00:00 2001 +From f7e6aa36cb060a0db52599ebe618f400952b819c 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 464e1e101..7b2eace75 100644 +index 464e1e101a..7b2eace75c 100644 --- a/src/main/java/net/minecraft/server/StructureGenerator.java +++ b/src/main/java/net/minecraft/server/StructureGenerator.java @@ -103,6 +103,7 @@ public abstract class StructureGenerator @@ -23,7 +23,7 @@ index 464e1e101..7b2eace75 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 77b805f3a..1e622a043 100644 +index 77b805f3ae..1e622a0434 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 { diff --git a/Spigot-Server-Patches/0136-Configurable-Cartographer-Treasure-Maps.patch b/Spigot-Server-Patches/0136-Configurable-Cartographer-Treasure-Maps.patch index 3f616ae389..3db35cb6db 100644 --- a/Spigot-Server-Patches/0136-Configurable-Cartographer-Treasure-Maps.patch +++ b/Spigot-Server-Patches/0136-Configurable-Cartographer-Treasure-Maps.patch @@ -1,4 +1,4 @@ -From 5a50217c62878cd2a708aca5df44f83b92ce07e2 Mon Sep 17 00:00:00 2001 +From b5e8d3ff369d3b7c9e0778907ee7bc7c8b5aaad4 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 4892113a1..406bc611c 100644 +index 4892113a15..406bc611c1 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java @@ -310,4 +310,14 @@ public class PaperWorldConfig { @@ -28,7 +28,7 @@ index 4892113a1..406bc611c 100644 + } } diff --git a/src/main/java/net/minecraft/server/VillagerTrades.java b/src/main/java/net/minecraft/server/VillagerTrades.java -index ff3f15eac..ae5ed782e 100644 +index 2a4e4f7859..0b66323698 100644 --- a/src/main/java/net/minecraft/server/VillagerTrades.java +++ b/src/main/java/net/minecraft/server/VillagerTrades.java @@ -89,6 +89,7 @@ public class VillagerTrades { diff --git a/Spigot-Server-Patches/0137-Optimize-ItemStack.isEmpty.patch b/Spigot-Server-Patches/0137-Optimize-ItemStack.isEmpty.patch index 7a05b2437a..ae07058636 100644 --- a/Spigot-Server-Patches/0137-Optimize-ItemStack.isEmpty.patch +++ b/Spigot-Server-Patches/0137-Optimize-ItemStack.isEmpty.patch @@ -1,4 +1,4 @@ -From 3820ee666676a9a9a03b771e6235c28375663d42 Mon Sep 17 00:00:00 2001 +From c44cd34d7c92e99e2e86e5a299038c47431a0192 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 b643a4123..b7d327211 100644 +index b643a41235..b7d327211c 100644 --- a/src/main/java/net/minecraft/server/ItemStack.java +++ b/src/main/java/net/minecraft/server/ItemStack.java @@ -145,7 +145,7 @@ public final class ItemStack { diff --git a/Spigot-Server-Patches/0138-Add-API-methods-to-control-if-armour-stands-can-move.patch b/Spigot-Server-Patches/0138-Add-API-methods-to-control-if-armour-stands-can-move.patch index bfdf1d4782..28d8ace4d1 100644 --- a/Spigot-Server-Patches/0138-Add-API-methods-to-control-if-armour-stands-can-move.patch +++ b/Spigot-Server-Patches/0138-Add-API-methods-to-control-if-armour-stands-can-move.patch @@ -1,11 +1,11 @@ -From 12da06361d096ef084a84abb7b64636287a4a63e Mon Sep 17 00:00:00 2001 +From 07215f52801b1713c125b00986bad333ba8f877f 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 87298320d..ebedb4178 100644 +index bee5444989..1ae3ffa666 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 87298320d..ebedb4178 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 2b66a08ad..124c3185b 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 { diff --git a/Spigot-Server-Patches/0139-Properly-fix-item-duplication-bug.patch b/Spigot-Server-Patches/0139-Properly-fix-item-duplication-bug.patch index 860dea4413..69ec73419c 100644 --- a/Spigot-Server-Patches/0139-Properly-fix-item-duplication-bug.patch +++ b/Spigot-Server-Patches/0139-Properly-fix-item-duplication-bug.patch @@ -1,4 +1,4 @@ -From 3a4cfaef071d0d7865b2e3b1fcb5cdac7dd0d648 Mon Sep 17 00:00:00 2001 +From bbac62adc341afbf098253a53dc889320609b618 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/0140-String-based-Action-Bar-API.patch b/Spigot-Server-Patches/0140-String-based-Action-Bar-API.patch index b0be0b4ad5..cc29bcfc7c 100644 --- a/Spigot-Server-Patches/0140-String-based-Action-Bar-API.patch +++ b/Spigot-Server-Patches/0140-String-based-Action-Bar-API.patch @@ -1,11 +1,11 @@ -From 9a7975a46570f5b6745635e8927fae84a4ab8c78 Mon Sep 17 00:00:00 2001 +From 766ad8f2753ec0d9fe801c07148905ca3c662079 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 c96f3ed17..1f6a12632 100644 +index c96f3ed176..1f6a126329 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 c96f3ed17..1f6a12632 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 eca8c0ded..f7ce4b106 100644 +index eca8c0ded9..f7ce4b1068 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -214,6 +214,18 @@ public class CraftPlayer extends CraftHumanEntity implements Player { diff --git a/Spigot-Server-Patches/0141-Firework-API-s.patch b/Spigot-Server-Patches/0141-Firework-API-s.patch index 63a9a5af65..130711e628 100644 --- a/Spigot-Server-Patches/0141-Firework-API-s.patch +++ b/Spigot-Server-Patches/0141-Firework-API-s.patch @@ -1,11 +1,11 @@ -From b0e0b780857cf3a272495b853a22be27ede59428 Mon Sep 17 00:00:00 2001 +From 551cf1e3fbf1952f3f6212335964010594571e50 Mon Sep 17 00:00:00 2001 From: Aikar Date: Wed, 28 Dec 2016 01:18:33 -0500 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 d6bde129e..5cee161b6 100644 +index 959ad19dec..b3f39d5a2f 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 d6bde129e..5cee161b6 100644 @Override diff --git a/src/main/java/net/minecraft/server/ItemFireworks.java b/src/main/java/net/minecraft/server/ItemFireworks.java -index 37caa79cb..aea46ffae 100644 +index 37caa79cba..aea46ffae5 100644 --- a/src/main/java/net/minecraft/server/ItemFireworks.java +++ b/src/main/java/net/minecraft/server/ItemFireworks.java @@ -17,6 +17,7 @@ public class ItemFireworks extends Item { @@ -78,7 +78,7 @@ index 37caa79cb..aea46ffae 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 3f6d2676e..b1fd18151 100644 +index 3f6d2676e7..b1fd18151b 100644 --- a/src/main/java/net/minecraft/server/NBTTagCompound.java +++ b/src/main/java/net/minecraft/server/NBTTagCompound.java @@ -112,7 +112,7 @@ public class NBTTagCompound implements NBTBase { @@ -91,7 +91,7 @@ index 3f6d2676e..b1fd18151 100644 } diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftFirework.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftFirework.java -index 6b69be742..37374ae5b 100644 +index 6b69be7421..37374ae5b3 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; diff --git a/Spigot-Server-Patches/0142-PlayerTeleportEndGatewayEvent.patch b/Spigot-Server-Patches/0142-PlayerTeleportEndGatewayEvent.patch index b1e40e2978..70b84d1201 100644 --- a/Spigot-Server-Patches/0142-PlayerTeleportEndGatewayEvent.patch +++ b/Spigot-Server-Patches/0142-PlayerTeleportEndGatewayEvent.patch @@ -1,4 +1,4 @@ -From 61880860d7580ad26c41f98b244b869f16231695 Mon Sep 17 00:00:00 2001 +From ea0af2efa81f55251e6eb6d8cb2ff2518ca9be3c 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 4bd4b93e6..6aa07da6e 100644 +index 2f44cf89f9..1783f59140 100644 --- a/src/main/java/net/minecraft/server/TileEntityEndGateway.java +++ b/src/main/java/net/minecraft/server/TileEntityEndGateway.java @@ -132,7 +132,7 @@ public class TileEntityEndGateway extends TileEntityEnderPortal implements ITick diff --git a/Spigot-Server-Patches/0143-Provide-E-TE-Chunk-count-stat-methods.patch b/Spigot-Server-Patches/0143-Provide-E-TE-Chunk-count-stat-methods.patch index 4f1b4a690c..2560ad110e 100644 --- a/Spigot-Server-Patches/0143-Provide-E-TE-Chunk-count-stat-methods.patch +++ b/Spigot-Server-Patches/0143-Provide-E-TE-Chunk-count-stat-methods.patch @@ -1,4 +1,4 @@ -From acaf32b038ea5a7b338b7c1225a99780241195df Mon Sep 17 00:00:00 2001 +From a84f1fdd229f23f78b2bb5b09bc5ca4bd677daa6 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 d000d595b..38e10017d 100644 +index bddfc796db..6f8c2a1d2b 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java @@ -265,6 +265,35 @@ public class CraftWorld implements World { diff --git a/Spigot-Server-Patches/0144-Enforce-Sync-Player-Saves.patch b/Spigot-Server-Patches/0144-Enforce-Sync-Player-Saves.patch index 07f9a56534..e737169fa8 100644 --- a/Spigot-Server-Patches/0144-Enforce-Sync-Player-Saves.patch +++ b/Spigot-Server-Patches/0144-Enforce-Sync-Player-Saves.patch @@ -1,4 +1,4 @@ -From d7d6889e72bad8d61240ff2399a180bd5598be2e Mon Sep 17 00:00:00 2001 +From 813e4e84c540068f7548a5ff8b28a474f0b715b8 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 7b6d518b1..f13d63030 100644 +index ce3282153a..f5d3447733 100644 --- a/src/main/java/net/minecraft/server/PlayerList.java +++ b/src/main/java/net/minecraft/server/PlayerList.java @@ -930,11 +930,13 @@ public abstract class PlayerList { diff --git a/Spigot-Server-Patches/0145-Don-t-allow-entities-to-ride-themselves-572.patch b/Spigot-Server-Patches/0145-Don-t-allow-entities-to-ride-themselves-572.patch index dd45db4493..4dfc9424fc 100644 --- a/Spigot-Server-Patches/0145-Don-t-allow-entities-to-ride-themselves-572.patch +++ b/Spigot-Server-Patches/0145-Don-t-allow-entities-to-ride-themselves-572.patch @@ -1,11 +1,11 @@ -From 295c0624ceff21d1a877c1413a967f55f2461fcf Mon Sep 17 00:00:00 2001 +From 1a5dc4c2056ae3efb29c34a563aaf1fb3f60bf29 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 7700652e1..c649507c8 100644 +index c5576e0325..e1ad87f2fe 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java @@ -1993,6 +1993,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke diff --git a/Spigot-Server-Patches/0146-Fix-block-break-desync.patch b/Spigot-Server-Patches/0146-Fix-block-break-desync.patch index 0224e571df..cdf9b10989 100644 --- a/Spigot-Server-Patches/0146-Fix-block-break-desync.patch +++ b/Spigot-Server-Patches/0146-Fix-block-break-desync.patch @@ -1,4 +1,4 @@ -From 9116d90f1a852980bbb8a81522a86b000bef214d Mon Sep 17 00:00:00 2001 +From ec79663eec931b273ac6a68c6c09e72a8bdae696 Mon Sep 17 00:00:00 2001 From: Michael Himing Date: Sun, 8 Jan 2017 18:50:35 +1100 Subject: [PATCH] Fix block break desync diff --git a/Spigot-Server-Patches/0147-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch b/Spigot-Server-Patches/0147-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch index b380a84f54..3b3e3439bd 100644 --- a/Spigot-Server-Patches/0147-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch +++ b/Spigot-Server-Patches/0147-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch @@ -1,4 +1,4 @@ -From 42663b4aeb5047b0dee9d5469cccf48aa3eb7bf4 Mon Sep 17 00:00:00 2001 +From 8c077494d6965ae2a1370f32120004dffcd22a1d 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 @@ -134,7 +134,7 @@ index bfba08fb24..49668f2c21 100644 @Override diff --git a/src/main/java/net/minecraft/server/EntityFishingHook.java b/src/main/java/net/minecraft/server/EntityFishingHook.java -index bdd2a39f89..67f8b68413 100644 +index 758559d35d..2a351701b4 100644 --- a/src/main/java/net/minecraft/server/EntityFishingHook.java +++ b/src/main/java/net/minecraft/server/EntityFishingHook.java @@ -404,7 +404,7 @@ public class EntityFishingHook extends Entity { @@ -147,7 +147,7 @@ index bdd2a39f89..67f8b68413 100644 // CraftBukkit end if (itemstack1.getItem().a(TagsItem.FISHES)) { diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java -index 12286beda9..ece2608389 100644 +index 5622c08f19..b402818008 100644 --- a/src/main/java/net/minecraft/server/EntityLiving.java +++ b/src/main/java/net/minecraft/server/EntityLiving.java @@ -385,7 +385,8 @@ public abstract class EntityLiving extends Entity { @@ -265,7 +265,7 @@ index d68826aa7b..0f6cd246ae 100644 } diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -index 38e10017d8..842c28f311 100644 +index 6f8c2a1d2b..9c68334377 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java @@ -1608,7 +1608,7 @@ public class CraftWorld implements World { diff --git a/Spigot-Server-Patches/0148-Cap-Entity-Collisions.patch b/Spigot-Server-Patches/0148-Cap-Entity-Collisions.patch index d85f03e4a1..9aa3c4f36b 100644 --- a/Spigot-Server-Patches/0148-Cap-Entity-Collisions.patch +++ b/Spigot-Server-Patches/0148-Cap-Entity-Collisions.patch @@ -1,4 +1,4 @@ -From b5d2a35c1f26a4a219b34d9deafec60cdbf2ee0c Mon Sep 17 00:00:00 2001 +From 409f6aeea4a679d35c735a1d3921688c89c8ce34 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sun, 22 Jan 2017 18:07:56 -0500 Subject: [PATCH] Cap Entity Collisions @@ -27,7 +27,7 @@ index 406bc611c1..58fe5a8c4d 100644 + } } diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java -index 50f130e1e4..7de73bf4cb 100644 +index e1ad87f2fe..e15fd1dc72 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java @@ -184,6 +184,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke @@ -39,7 +39,7 @@ index 50f130e1e4..7de73bf4cb 100644 // Spigot end diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java -index ece2608389..fdb0934a88 100644 +index b402818008..5e58930e81 100644 --- a/src/main/java/net/minecraft/server/EntityLiving.java +++ b/src/main/java/net/minecraft/server/EntityLiving.java @@ -2559,8 +2559,11 @@ public abstract class EntityLiving extends Entity { diff --git a/Spigot-Server-Patches/0149-Remove-CraftScheduler-Async-Task-Debugger.patch b/Spigot-Server-Patches/0149-Remove-CraftScheduler-Async-Task-Debugger.patch index e2e087b4f5..c00c2cf163 100644 --- a/Spigot-Server-Patches/0149-Remove-CraftScheduler-Async-Task-Debugger.patch +++ b/Spigot-Server-Patches/0149-Remove-CraftScheduler-Async-Task-Debugger.patch @@ -1,4 +1,4 @@ -From ed4fd5f49c80eea691f8ef028e22d70391985383 Mon Sep 17 00:00:00 2001 +From 90cd667f96bdbdbcea992cf44dbdb0cb852de9d8 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sun, 5 Feb 2017 00:04:04 -0500 Subject: [PATCH] Remove CraftScheduler Async Task Debugger @@ -9,7 +9,7 @@ One report of a suspected memory leak with the system. This adds additional overhead to asynchronous task dispatching diff --git a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java -index 552daf437..e102be583 100644 +index 552daf4376..e102be583c 100644 --- a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java +++ b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java @@ -414,7 +414,7 @@ public class CraftScheduler implements BukkitScheduler { diff --git a/Spigot-Server-Patches/0150-Make-targetSize-more-aggressive-in-the-chunk-unload-.patch b/Spigot-Server-Patches/0150-Make-targetSize-more-aggressive-in-the-chunk-unload-.patch index 97698b2991..514a8198cb 100644 --- a/Spigot-Server-Patches/0150-Make-targetSize-more-aggressive-in-the-chunk-unload-.patch +++ b/Spigot-Server-Patches/0150-Make-targetSize-more-aggressive-in-the-chunk-unload-.patch @@ -1,11 +1,11 @@ -From 78203ccab7cc30370850c42578162e394a7172fb Mon Sep 17 00:00:00 2001 +From 5adde883121a04ed9985885881d9b0a640d53d2b 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 ff32fe32ce..74a1b4a852 100644 +index e0e11b6f2e..fba9f4b8a1 100644 --- a/src/main/java/net/minecraft/server/PlayerChunkMap.java +++ b/src/main/java/net/minecraft/server/PlayerChunkMap.java @@ -81,7 +81,7 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d { diff --git a/Spigot-Server-Patches/0151-Do-not-let-armorstands-drown.patch b/Spigot-Server-Patches/0151-Do-not-let-armorstands-drown.patch index 154c5cb734..ec88952ba8 100644 --- a/Spigot-Server-Patches/0151-Do-not-let-armorstands-drown.patch +++ b/Spigot-Server-Patches/0151-Do-not-let-armorstands-drown.patch @@ -1,4 +1,4 @@ -From 59523c866b71c8d72e7edaaa4c83edc95206a574 Mon Sep 17 00:00:00 2001 +From 32ac7ace4b6af1df6526f16891d48900611f2cf6 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 @@ -20,7 +20,7 @@ index 1ae3ffa666..81226d6042 100644 // Paper end } diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java -index fdb0934a88..d0738c5f7f 100644 +index 5e58930e81..ed528faada 100644 --- a/src/main/java/net/minecraft/server/EntityLiving.java +++ b/src/main/java/net/minecraft/server/EntityLiving.java @@ -223,6 +223,7 @@ public abstract class EntityLiving extends Entity { diff --git a/Spigot-Server-Patches/0152-Properly-handle-async-calls-to-restart-the-server.patch b/Spigot-Server-Patches/0152-Properly-handle-async-calls-to-restart-the-server.patch index 095988aa60..71cc67029a 100644 --- a/Spigot-Server-Patches/0152-Properly-handle-async-calls-to-restart-the-server.patch +++ b/Spigot-Server-Patches/0152-Properly-handle-async-calls-to-restart-the-server.patch @@ -1,4 +1,4 @@ -From 0aa47587c6fc96c817a9019e0d578a39a955c194 Mon Sep 17 00:00:00 2001 +From da757a6397a45f17d376314e0fa47d01e3f68925 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 f142ed9a3..e7b89b320 100644 +index f142ed9a3b..e7b89b3206 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -80,6 +80,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant Date: Sat, 13 May 2017 20:11:21 -0500 Subject: [PATCH] Add system property to disable book size limits @@ -11,7 +11,7 @@ to make books with as much data as they want. Do not use this without limiting incoming data from packets in some other way. diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaBook.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaBook.java -index fe8e6dcb7..f8a3c9718 100644 +index fe8e6dcb77..f8a3c9718d 100644 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaBook.java +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaBook.java @@ -36,6 +36,7 @@ public class CraftMetaBook extends CraftMetaItem implements BookMeta { diff --git a/Spigot-Server-Patches/0154-Add-option-to-make-parrots-stay-on-shoulders-despite.patch b/Spigot-Server-Patches/0154-Add-option-to-make-parrots-stay-on-shoulders-despite.patch index 9ce4d54d29..bf5688c6e7 100644 --- a/Spigot-Server-Patches/0154-Add-option-to-make-parrots-stay-on-shoulders-despite.patch +++ b/Spigot-Server-Patches/0154-Add-option-to-make-parrots-stay-on-shoulders-despite.patch @@ -1,4 +1,4 @@ -From 255d84c72629df900fefb1e55589d969ba3e21a0 Mon Sep 17 00:00:00 2001 +From 05129391a900b13a7871942312e99ef457313d98 Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Tue, 16 May 2017 21:29:08 -0500 Subject: [PATCH] Add option to make parrots stay on shoulders despite movement @@ -26,7 +26,7 @@ index 58fe5a8c4d..a341214952 100644 + } } diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java -index f8e38db496..ca93220d32 100644 +index 892922ca63..cfcbd1a2e5 100644 --- a/src/main/java/net/minecraft/server/EntityHuman.java +++ b/src/main/java/net/minecraft/server/EntityHuman.java @@ -436,7 +436,7 @@ public abstract class EntityHuman extends EntityLiving { diff --git a/Spigot-Server-Patches/0155-Add-configuration-option-to-prevent-player-names-fro.patch b/Spigot-Server-Patches/0155-Add-configuration-option-to-prevent-player-names-fro.patch index cfa51dfa52..1db5159923 100644 --- a/Spigot-Server-Patches/0155-Add-configuration-option-to-prevent-player-names-fro.patch +++ b/Spigot-Server-Patches/0155-Add-configuration-option-to-prevent-player-names-fro.patch @@ -1,4 +1,4 @@ -From 514ab505a10d9c63f9771b06b0338fc97ad8df8a Mon Sep 17 00:00:00 2001 +From 39e6d6358c6ccf89ce93b99bb0cd246beca503ad 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 503e13775..56cea23b0 100644 +index 503e137750..56cea23b06 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 503e13775..56cea23b0 100644 + } } diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index e79ea322a..e5360b950 100644 +index 56fa5a7b8a..d80bed4544 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -2081,5 +2081,10 @@ public final class CraftServer implements Server { diff --git a/Spigot-Server-Patches/0156-Use-TerminalConsoleAppender-for-console-improvements.patch b/Spigot-Server-Patches/0156-Use-TerminalConsoleAppender-for-console-improvements.patch index ca138c10db..8e3ea05241 100644 --- a/Spigot-Server-Patches/0156-Use-TerminalConsoleAppender-for-console-improvements.patch +++ b/Spigot-Server-Patches/0156-Use-TerminalConsoleAppender-for-console-improvements.patch @@ -1,4 +1,4 @@ -From 4bc8854be175c2923fe2da08779d1584af00c2dc Mon Sep 17 00:00:00 2001 +From 97087dfdeebf653bf1ff6170c2ff7d028c2dc53a Mon Sep 17 00:00:00 2001 From: Minecrell Date: Fri, 9 Jun 2017 19:03:43 +0200 Subject: [PATCH] Use TerminalConsoleAppender for console improvements @@ -19,7 +19,7 @@ Other changes: configuration diff --git a/pom.xml b/pom.xml -index 7b9fcb2c0..851646727 100644 +index 251fa0bc36..d379d33d15 100644 --- a/pom.xml +++ b/pom.xml @@ -41,10 +41,27 @@ @@ -75,7 +75,7 @@ index 7b9fcb2c0..851646727 100644 org.apache.maven.plugins diff --git a/src/main/java/com/destroystokyo/paper/console/PaperConsole.java b/src/main/java/com/destroystokyo/paper/console/PaperConsole.java new file mode 100644 -index 000000000..cd6e25923 +index 0000000000..cd6e259239 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/console/PaperConsole.java @@ -0,0 +1,40 @@ @@ -121,7 +121,7 @@ index 000000000..cd6e25923 +} diff --git a/src/main/java/com/destroystokyo/paper/console/TerminalConsoleCommandSender.java b/src/main/java/com/destroystokyo/paper/console/TerminalConsoleCommandSender.java new file mode 100644 -index 000000000..685deaa0e +index 0000000000..685deaa0e5 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/console/TerminalConsoleCommandSender.java @@ -0,0 +1,17 @@ @@ -143,7 +143,7 @@ index 000000000..685deaa0e + +} diff --git a/src/main/java/net/minecraft/server/DedicatedServer.java b/src/main/java/net/minecraft/server/DedicatedServer.java -index f0e2250cd..37020dcba 100644 +index f0e2250cd8..37020dcba5 100644 --- a/src/main/java/net/minecraft/server/DedicatedServer.java +++ b/src/main/java/net/minecraft/server/DedicatedServer.java @@ -83,6 +83,9 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer @@ -185,7 +185,7 @@ index f0e2250cd..37020dcba 100644 System.setOut(new PrintStream(new LoggerOutputStream(logger, Level.INFO), true)); System.setErr(new PrintStream(new LoggerOutputStream(logger, Level.WARN), true)); diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index e7b89b320..6b83f9769 100644 +index e7b89b3206..6b83f9769a 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -50,7 +50,7 @@ import org.apache.commons.lang3.Validate; @@ -244,7 +244,7 @@ index e7b89b320..6b83f9769 100644 public KeyPair getKeyPair() { diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java -index 3158197cd..b746e7ad3 100644 +index 195ac836a9..1bb739b0b8 100644 --- a/src/main/java/net/minecraft/server/PlayerList.java +++ b/src/main/java/net/minecraft/server/PlayerList.java @@ -76,8 +76,7 @@ public abstract class PlayerList { @@ -258,7 +258,7 @@ index 3158197cd..b746e7ad3 100644 this.k = new GameProfileBanList(PlayerList.a); diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index e5360b950..0dda95ba8 100644 +index d80bed4544..b6ae46ae00 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -41,7 +41,6 @@ import java.util.function.Consumer; @@ -284,7 +284,7 @@ index e5360b950..0dda95ba8 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 c5d5121fd..4aebe53f8 100644 +index c5d5121fd9..4aebe53f8a 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; @@ -326,7 +326,7 @@ index c5d5121fd..4aebe53f8 100644 if (Main.class.getPackage().getImplementationVendor() != null && System.getProperty("IReallyKnowWhatIAmDoingISwear") == null) { diff --git a/src/main/java/org/bukkit/craftbukkit/command/ColouredConsoleSender.java b/src/main/java/org/bukkit/craftbukkit/command/ColouredConsoleSender.java deleted file mode 100644 -index fdf2f075e..000000000 +index fdf2f075e2..0000000000 --- a/src/main/java/org/bukkit/craftbukkit/command/ColouredConsoleSender.java +++ /dev/null @@ -1,72 +0,0 @@ @@ -403,7 +403,7 @@ index fdf2f075e..000000000 - } -} diff --git a/src/main/java/org/bukkit/craftbukkit/command/ConsoleCommandCompleter.java b/src/main/java/org/bukkit/craftbukkit/command/ConsoleCommandCompleter.java -index befcc19f9..5510266fb 100644 +index befcc19f9b..5510266fb1 100644 --- a/src/main/java/org/bukkit/craftbukkit/command/ConsoleCommandCompleter.java +++ b/src/main/java/org/bukkit/craftbukkit/command/ConsoleCommandCompleter.java @@ -4,20 +4,31 @@ import java.util.Collections; @@ -486,7 +486,7 @@ index befcc19f9..5510266fb 100644 } } diff --git a/src/main/java/org/bukkit/craftbukkit/util/ServerShutdownThread.java b/src/main/java/org/bukkit/craftbukkit/util/ServerShutdownThread.java -index 70f8d4299..449e99d1b 100644 +index 70f8d42992..449e99d1b6 100644 --- a/src/main/java/org/bukkit/craftbukkit/util/ServerShutdownThread.java +++ b/src/main/java/org/bukkit/craftbukkit/util/ServerShutdownThread.java @@ -17,7 +17,7 @@ public class ServerShutdownThread extends Thread { @@ -500,7 +500,7 @@ index 70f8d4299..449e99d1b 100644 } diff --git a/src/main/java/org/bukkit/craftbukkit/util/TerminalConsoleWriterThread.java b/src/main/java/org/bukkit/craftbukkit/util/TerminalConsoleWriterThread.java deleted file mode 100644 -index f267f99f9..000000000 +index f267f99f96..0000000000 --- a/src/main/java/org/bukkit/craftbukkit/util/TerminalConsoleWriterThread.java +++ /dev/null @@ -1,57 +0,0 @@ @@ -562,7 +562,7 @@ index f267f99f9..000000000 - } -} diff --git a/src/main/resources/log4j2.xml b/src/main/resources/log4j2.xml -index 490a9acc7..08b6bb7f9 100644 +index 490a9acc70..08b6bb7f97 100644 --- a/src/main/resources/log4j2.xml +++ b/src/main/resources/log4j2.xml @@ -1,12 +1,11 @@ diff --git a/Spigot-Server-Patches/0157-provide-a-configurable-option-to-disable-creeper-lin.patch b/Spigot-Server-Patches/0157-provide-a-configurable-option-to-disable-creeper-lin.patch index bb489a0ae9..6a4f44cbbb 100644 --- a/Spigot-Server-Patches/0157-provide-a-configurable-option-to-disable-creeper-lin.patch +++ b/Spigot-Server-Patches/0157-provide-a-configurable-option-to-disable-creeper-lin.patch @@ -1,4 +1,4 @@ -From 6b7d5cdf9b66081bf07edbdc5912353ce205d2ff Mon Sep 17 00:00:00 2001 +From 46358410370647ac8df70a93b574278f8d7cfc27 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 a34121495..abc967d3f 100644 +index a341214952..abc967d3f5 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java @@ -332,4 +332,10 @@ public class PaperWorldConfig { @@ -21,7 +21,7 @@ index a34121495..abc967d3f 100644 + } } diff --git a/src/main/java/net/minecraft/server/EntityCreeper.java b/src/main/java/net/minecraft/server/EntityCreeper.java -index 13ddc00d6..9f03d0337 100644 +index 13ddc00d68..9f03d03375 100644 --- a/src/main/java/net/minecraft/server/EntityCreeper.java +++ b/src/main/java/net/minecraft/server/EntityCreeper.java @@ -225,7 +225,7 @@ public class EntityCreeper extends EntityMonster { diff --git a/Spigot-Server-Patches/0158-Item-canEntityPickup.patch b/Spigot-Server-Patches/0158-Item-canEntityPickup.patch index 605b5c0f41..9d8c16f90d 100644 --- a/Spigot-Server-Patches/0158-Item-canEntityPickup.patch +++ b/Spigot-Server-Patches/0158-Item-canEntityPickup.patch @@ -1,11 +1,11 @@ -From 672ef01070780e3d981347f7ddb87c7ef8b0484c Mon Sep 17 00:00:00 2001 +From 62509c0db2d8acda7480ae7113910d4c6653e4d7 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 00b51d88b..11652628b 100644 +index 0ecbf873bf..c2771c5d94 100644 --- a/src/main/java/net/minecraft/server/EntityInsentient.java +++ b/src/main/java/net/minecraft/server/EntityInsentient.java @@ -510,6 +510,11 @@ public abstract class EntityInsentient extends EntityLiving { @@ -21,7 +21,7 @@ index 00b51d88b..11652628b 100644 } } diff --git a/src/main/java/net/minecraft/server/EntityItem.java b/src/main/java/net/minecraft/server/EntityItem.java -index ba2ca1185..9c743de8d 100644 +index ba2ca11855..9c743de8dd 100644 --- a/src/main/java/net/minecraft/server/EntityItem.java +++ b/src/main/java/net/minecraft/server/EntityItem.java @@ -19,6 +19,7 @@ public class EntityItem extends Entity { @@ -33,7 +33,7 @@ index ba2ca1185..9c743de8d 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 cc593fbc9..3f552b590 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 { diff --git a/Spigot-Server-Patches/0159-PlayerPickupItemEvent-setFlyAtPlayer.patch b/Spigot-Server-Patches/0159-PlayerPickupItemEvent-setFlyAtPlayer.patch index 577248a32b..48da3177c7 100644 --- a/Spigot-Server-Patches/0159-PlayerPickupItemEvent-setFlyAtPlayer.patch +++ b/Spigot-Server-Patches/0159-PlayerPickupItemEvent-setFlyAtPlayer.patch @@ -1,11 +1,11 @@ -From 98f98df260c50a7ca6bc2bfcce13abeeb68fa6f8 Mon Sep 17 00:00:00 2001 +From 6954d7244ad5458165cc08bc4c82ca630a497eaf 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 9c743de8d..2deb5c494 100644 +index 9c743de8dd..2deb5c494d 100644 --- a/src/main/java/net/minecraft/server/EntityItem.java +++ b/src/main/java/net/minecraft/server/EntityItem.java @@ -318,6 +318,7 @@ public class EntityItem extends Entity { diff --git a/Spigot-Server-Patches/0160-PlayerAttemptPickupItemEvent.patch b/Spigot-Server-Patches/0160-PlayerAttemptPickupItemEvent.patch index ee85bd27df..81ce15d0d6 100644 --- a/Spigot-Server-Patches/0160-PlayerAttemptPickupItemEvent.patch +++ b/Spigot-Server-Patches/0160-PlayerAttemptPickupItemEvent.patch @@ -1,11 +1,11 @@ -From 74d956e17d0ab409ddfbf3d6dab9ac74ef9c202f Mon Sep 17 00:00:00 2001 +From 6b304a5d9db67057a7d7b5eb4c2dd7862660eed2 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 2deb5c494..bda5ea463 100644 +index 2deb5c494d..bda5ea4632 100644 --- a/src/main/java/net/minecraft/server/EntityItem.java +++ b/src/main/java/net/minecraft/server/EntityItem.java @@ -8,6 +8,7 @@ import javax.annotation.Nullable; diff --git a/Spigot-Server-Patches/0161-Add-UnknownCommandEvent.patch b/Spigot-Server-Patches/0161-Add-UnknownCommandEvent.patch index cb74b29ad5..86da861217 100644 --- a/Spigot-Server-Patches/0161-Add-UnknownCommandEvent.patch +++ b/Spigot-Server-Patches/0161-Add-UnknownCommandEvent.patch @@ -1,11 +1,11 @@ -From 69b3d26c5d5729f4f5fe7be3eff49ceb86cdd95c Mon Sep 17 00:00:00 2001 +From 628a23b4ebb8d0ce949e0bcdb4dd8487fae10eec Mon Sep 17 00:00:00 2001 From: Sweepyoface Date: Sat, 17 Jun 2017 18:48:21 -0400 Subject: [PATCH] Add UnknownCommandEvent diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 0dda95ba8..a79403cbc 100644 +index b6ae46ae00..5e0118978d 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -77,6 +77,7 @@ import net.minecraft.server.WorldServer; diff --git a/Spigot-Server-Patches/0162-Basic-PlayerProfile-API.patch b/Spigot-Server-Patches/0162-Basic-PlayerProfile-API.patch index e50adc0841..b4a5244396 100644 --- a/Spigot-Server-Patches/0162-Basic-PlayerProfile-API.patch +++ b/Spigot-Server-Patches/0162-Basic-PlayerProfile-API.patch @@ -1,4 +1,4 @@ -From c1cb5f3655ba9abdf7e60c6227fff0057a613cc8 Mon Sep 17 00:00:00 2001 +From 7cc3291654812ed7dc75da700cd94f8f740f7bbc Mon Sep 17 00:00:00 2001 From: Aikar Date: Mon, 15 Jan 2018 22:11:48 -0500 Subject: [PATCH] Basic PlayerProfile API @@ -7,7 +7,7 @@ Establishes base extension of profile systems for future edits too diff --git a/src/main/java/com/destroystokyo/paper/profile/CraftPlayerProfile.java b/src/main/java/com/destroystokyo/paper/profile/CraftPlayerProfile.java new file mode 100644 -index 000000000..b151a13c1 +index 0000000000..b151a13c1b --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/profile/CraftPlayerProfile.java @@ -0,0 +1,280 @@ @@ -293,7 +293,7 @@ index 000000000..b151a13c1 +} diff --git a/src/main/java/com/destroystokyo/paper/profile/PaperAuthenticationService.java b/src/main/java/com/destroystokyo/paper/profile/PaperAuthenticationService.java new file mode 100644 -index 000000000..25836b975 +index 0000000000..25836b975b --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/profile/PaperAuthenticationService.java @@ -0,0 +1,30 @@ @@ -329,7 +329,7 @@ index 000000000..25836b975 +} diff --git a/src/main/java/com/destroystokyo/paper/profile/PaperGameProfileRepository.java b/src/main/java/com/destroystokyo/paper/profile/PaperGameProfileRepository.java new file mode 100644 -index 000000000..3bcdb8f93 +index 0000000000..3bcdb8f93f --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/profile/PaperGameProfileRepository.java @@ -0,0 +1,17 @@ @@ -352,7 +352,7 @@ index 000000000..3bcdb8f93 +} diff --git a/src/main/java/com/destroystokyo/paper/profile/PaperMinecraftSessionService.java b/src/main/java/com/destroystokyo/paper/profile/PaperMinecraftSessionService.java new file mode 100644 -index 000000000..4b2a67423 +index 0000000000..4b2a67423f --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/profile/PaperMinecraftSessionService.java @@ -0,0 +1,29 @@ @@ -387,7 +387,7 @@ index 000000000..4b2a67423 +} diff --git a/src/main/java/com/destroystokyo/paper/profile/PaperUserAuthentication.java b/src/main/java/com/destroystokyo/paper/profile/PaperUserAuthentication.java new file mode 100644 -index 000000000..3aceb0ea8 +index 0000000000..3aceb0ea8a --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/profile/PaperUserAuthentication.java @@ -0,0 +1,11 @@ @@ -403,7 +403,7 @@ index 000000000..3aceb0ea8 + } +} diff --git a/src/main/java/net/minecraft/server/MCUtil.java b/src/main/java/net/minecraft/server/MCUtil.java -index 1f6a12632..6d278a0da 100644 +index 1f6a126329..6d278a0da5 100644 --- a/src/main/java/net/minecraft/server/MCUtil.java +++ b/src/main/java/net/minecraft/server/MCUtil.java @@ -1,7 +1,10 @@ @@ -429,7 +429,7 @@ index 1f6a12632..6d278a0da 100644 * Calculates distance between 2 entities * @param e1 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 6b83f9769..5817e9452 100644 +index 6b83f9769a..5817e94525 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -1246,7 +1246,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant Date: Sat, 17 Jun 2017 15:18:30 -0400 Subject: [PATCH] Shoulder Entities Release API diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java -index cfcbd1a2e..b8fe15f1a 100644 +index cfcbd1a2e5..b8fe15f1a1 100644 --- a/src/main/java/net/minecraft/server/EntityHuman.java +++ b/src/main/java/net/minecraft/server/EntityHuman.java @@ -1781,20 +1781,45 @@ public abstract class EntityHuman extends EntityLiving { @@ -59,7 +59,7 @@ index cfcbd1a2e..b8fe15f1a 100644 @Override public abstract boolean isSpectator(); diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java -index 772f919b6..bb4dde0de 100644 +index 772f919b6c..bb4dde0de0 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java @@ -660,6 +660,32 @@ public class CraftHumanEntity extends CraftLivingEntity implements HumanEntity { diff --git a/Spigot-Server-Patches/0164-Profile-Lookup-Events.patch b/Spigot-Server-Patches/0164-Profile-Lookup-Events.patch index c36998ad17..05d980c4ed 100644 --- a/Spigot-Server-Patches/0164-Profile-Lookup-Events.patch +++ b/Spigot-Server-Patches/0164-Profile-Lookup-Events.patch @@ -1,4 +1,4 @@ -From c92972668193e410f38f1bb378000aaa1c43e513 Mon Sep 17 00:00:00 2001 +From 5301e16c1216d2146c164d9a23cab53c92c97d31 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 3bcdb8f93..bb9894318 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 @@ diff --git a/Spigot-Server-Patches/0165-Block-player-logins-during-server-shutdown.patch b/Spigot-Server-Patches/0165-Block-player-logins-during-server-shutdown.patch index 88f904242b..5dbfe2fab5 100644 --- a/Spigot-Server-Patches/0165-Block-player-logins-during-server-shutdown.patch +++ b/Spigot-Server-Patches/0165-Block-player-logins-during-server-shutdown.patch @@ -1,11 +1,11 @@ -From 469412b6d973c55f65841d6d40b05000574526ba Mon Sep 17 00:00:00 2001 +From 0ade43d4210d4e2f244701125840647514480c73 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 22d5c7d20..91b6f1de8 100644 +index 22d5c7d20a..91b6f1de80 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 { diff --git a/Spigot-Server-Patches/0166-Entity-fromMobSpawner.patch b/Spigot-Server-Patches/0166-Entity-fromMobSpawner.patch index bf8d2d0b3f..5e80441f55 100644 --- a/Spigot-Server-Patches/0166-Entity-fromMobSpawner.patch +++ b/Spigot-Server-Patches/0166-Entity-fromMobSpawner.patch @@ -1,11 +1,11 @@ -From 77dedb3dc8183ec61e222fc5ada13fe513a3ee42 Mon Sep 17 00:00:00 2001 +From 252b712934f67d9992d5cacd531e3fae66682ba7 Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Sun, 18 Jun 2017 18:17:05 -0500 Subject: [PATCH] Entity#fromMobSpawner() diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java -index 596804637..d5d86d0f1 100644 +index e15fd1dc72..0915dede9a 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java @@ -184,6 +184,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke @@ -37,7 +37,7 @@ index 596804637..d5d86d0f1 100644 } catch (Throwable throwable) { diff --git a/src/main/java/net/minecraft/server/MobSpawnerAbstract.java b/src/main/java/net/minecraft/server/MobSpawnerAbstract.java -index b3af4ba23..7d140a6f5 100644 +index b3af4ba233..7d140a6f5a 100644 --- a/src/main/java/net/minecraft/server/MobSpawnerAbstract.java +++ b/src/main/java/net/minecraft/server/MobSpawnerAbstract.java @@ -133,6 +133,7 @@ public abstract class MobSpawnerAbstract { @@ -49,7 +49,7 @@ index b3af4ba23..7d140a6f5 100644 if ( entity.world.spigotConfig.nerfSpawnerMobs ) { diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java -index ed496d03a..b000bc8c7 100644 +index ed496d03ae..b000bc8c71 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java @@ -1047,5 +1047,10 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity { diff --git a/Spigot-Server-Patches/0167-Improve-the-Saddle-API-for-Horses.patch b/Spigot-Server-Patches/0167-Improve-the-Saddle-API-for-Horses.patch index 8924f8d5b2..edf9439d0f 100644 --- a/Spigot-Server-Patches/0167-Improve-the-Saddle-API-for-Horses.patch +++ b/Spigot-Server-Patches/0167-Improve-the-Saddle-API-for-Horses.patch @@ -1,4 +1,4 @@ -From 5759adc1ce63ee021fd1b482f18f996cf8d3cd12 Mon Sep 17 00:00:00 2001 +From 5227dc8f3177c32c10bf702f8bf6f7782d865e7f 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 09016e354..9952db3eb 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 09016e354..9952db3eb 100644 } } diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryHorse.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryHorse.java -index 63991bf4b..9a47a1adc 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 63991bf4b..9a47a1adc 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 000000000..99cfbaf90 +index 0000000000..99cfbaf90b --- /dev/null +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftSaddledInventory.java @@ -0,0 +1,15 @@ diff --git a/Spigot-Server-Patches/0168-Implement-ensureServerConversions-API.patch b/Spigot-Server-Patches/0168-Implement-ensureServerConversions-API.patch index 0e87f1260b..c7e81cca5f 100644 --- a/Spigot-Server-Patches/0168-Implement-ensureServerConversions-API.patch +++ b/Spigot-Server-Patches/0168-Implement-ensureServerConversions-API.patch @@ -1,4 +1,4 @@ -From 3a91c595520f4e2f4f025714dde30f9890c23765 Mon Sep 17 00:00:00 2001 +From 5323784dc94c11706b0a7a3c40955c649c6c9cd4 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 a4320f844..af1db68aa 100644 +index a4320f8446..af1db68aa7 100644 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java @@ -321,4 +321,10 @@ public final class CraftItemFactory implements ItemFactory { diff --git a/Spigot-Server-Patches/0169-Implement-getI18NDisplayName.patch b/Spigot-Server-Patches/0169-Implement-getI18NDisplayName.patch index ebc7462676..5a95cd2b28 100644 --- a/Spigot-Server-Patches/0169-Implement-getI18NDisplayName.patch +++ b/Spigot-Server-Patches/0169-Implement-getI18NDisplayName.patch @@ -1,4 +1,4 @@ -From b44ed17521d95d5fd90ea2b1aebf991166dacbc9 Mon Sep 17 00:00:00 2001 +From ff70ec35dc5363602faa429e835eef72465a458f 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 8fe8e28aa..295c01b28 100644 +index 8fe8e28aa3..295c01b281 100644 --- a/src/main/java/net/minecraft/server/LocaleLanguage.java +++ b/src/main/java/net/minecraft/server/LocaleLanguage.java @@ -44,10 +44,12 @@ public class LocaleLanguage { @@ -25,7 +25,7 @@ index 8fe8e28aa..295c01b28 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 af1db68aa..929d73692 100644 +index af1db68aa7..929d73692a 100644 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java @@ -326,5 +326,18 @@ public final class CraftItemFactory implements ItemFactory { diff --git a/Spigot-Server-Patches/0170-ProfileWhitelistVerifyEvent.patch b/Spigot-Server-Patches/0170-ProfileWhitelistVerifyEvent.patch index fd48ca11eb..bbc6462121 100644 --- a/Spigot-Server-Patches/0170-ProfileWhitelistVerifyEvent.patch +++ b/Spigot-Server-Patches/0170-ProfileWhitelistVerifyEvent.patch @@ -1,11 +1,11 @@ -From 8a6c19d9a5fcd931baef80d2e10c62e39fb5547b Mon Sep 17 00:00:00 2001 +From da9d652a265b28bd8632ebbe3ba6cc86e790d61c 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 b746e7ad3..5ac4a7c28 100644 +index 1bb739b0b8..f3e228c8e2 100644 --- a/src/main/java/net/minecraft/server/PlayerList.java +++ b/src/main/java/net/minecraft/server/PlayerList.java @@ -521,9 +521,9 @@ public abstract class PlayerList { diff --git a/Spigot-Server-Patches/0171-Fix-this-stupid-bullshit.patch b/Spigot-Server-Patches/0171-Fix-this-stupid-bullshit.patch index 8cc853585b..9f390c25cd 100644 --- a/Spigot-Server-Patches/0171-Fix-this-stupid-bullshit.patch +++ b/Spigot-Server-Patches/0171-Fix-this-stupid-bullshit.patch @@ -1,4 +1,4 @@ -From 76d0897115304161ea2df8d8846b1133de6653cf Mon Sep 17 00:00:00 2001 +From 4854b8a0fc33574ee78945918acd9701791e43d0 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 4aebe53f8..405ea5c46 100644 +index 4aebe53f8a..405ea5c465 100644 --- a/src/main/java/org/bukkit/craftbukkit/Main.java +++ b/src/main/java/org/bukkit/craftbukkit/Main.java @@ -217,10 +217,12 @@ public class Main { diff --git a/Spigot-Server-Patches/0172-Ocelot-despawns-should-honor-nametags-and-leash.patch b/Spigot-Server-Patches/0172-Ocelot-despawns-should-honor-nametags-and-leash.patch index 3ba09fe0d5..0a81c963b2 100644 --- a/Spigot-Server-Patches/0172-Ocelot-despawns-should-honor-nametags-and-leash.patch +++ b/Spigot-Server-Patches/0172-Ocelot-despawns-should-honor-nametags-and-leash.patch @@ -1,11 +1,11 @@ -From 6e902e4c9d44de19206fcc7967e4ceae4c41c2d2 Mon Sep 17 00:00:00 2001 +From adc73246c2c3598670d023c7776a515f951481a2 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 af1ff9518..1713bead2 100644 +index af1ff95182..1713bead27 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 { diff --git a/Spigot-Server-Patches/0173-Reset-spawner-timer-when-spawner-event-is-cancelled.patch b/Spigot-Server-Patches/0173-Reset-spawner-timer-when-spawner-event-is-cancelled.patch index 3acb8f7972..50eeec82d7 100644 --- a/Spigot-Server-Patches/0173-Reset-spawner-timer-when-spawner-event-is-cancelled.patch +++ b/Spigot-Server-Patches/0173-Reset-spawner-timer-when-spawner-event-is-cancelled.patch @@ -1,11 +1,11 @@ -From 7098a89418d9a77aeefb877af5fabd6f01789d6e Mon Sep 17 00:00:00 2001 +From a10f04d7a167109b8b242a5fcde154984885b9d0 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 7d140a6f5..93fad14d3 100644 +index 7d140a6f5a..93fad14d3f 100644 --- a/src/main/java/net/minecraft/server/MobSpawnerAbstract.java +++ b/src/main/java/net/minecraft/server/MobSpawnerAbstract.java @@ -139,6 +139,9 @@ public abstract class MobSpawnerAbstract { diff --git a/Spigot-Server-Patches/0174-Fix-MC-117075-TE-Unload-Lag-Spike.patch b/Spigot-Server-Patches/0174-Fix-MC-117075-TE-Unload-Lag-Spike.patch index 2ca3d308bf..e333efcd38 100644 --- a/Spigot-Server-Patches/0174-Fix-MC-117075-TE-Unload-Lag-Spike.patch +++ b/Spigot-Server-Patches/0174-Fix-MC-117075-TE-Unload-Lag-Spike.patch @@ -1,11 +1,11 @@ -From 5a73c1dbbd07e2ebeda89b6ed04edc5694e70697 Mon Sep 17 00:00:00 2001 +From 21db6e1450839d459f3b24c0d0005d7e307bb38f 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 6b2769343..3e5c76d32 100644 +index 34d35f4fa5..71c4861712 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -738,7 +738,11 @@ public abstract class World implements IIBlockAccess, GeneratorAccess, AutoClose diff --git a/Spigot-Server-Patches/0175-Allow-specifying-a-custom-authentication-servers-dow.patch b/Spigot-Server-Patches/0175-Allow-specifying-a-custom-authentication-servers-dow.patch index ab52e0546f..7fd2007ce4 100644 --- a/Spigot-Server-Patches/0175-Allow-specifying-a-custom-authentication-servers-dow.patch +++ b/Spigot-Server-Patches/0175-Allow-specifying-a-custom-authentication-servers-dow.patch @@ -1,4 +1,4 @@ -From 0f32a1be8ccb2b28d30637765777a3599c3aa2ae Mon Sep 17 00:00:00 2001 +From 3f68d7c94a85c6da5a5272bb49c3ee45cdb14e9e 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 56cea23b0..f4d089f3e 100644 +index 56cea23b06..f4d089f3ef 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 56cea23b0..f4d089f3e 100644 + } } diff --git a/src/main/java/net/minecraft/server/LoginListener.java b/src/main/java/net/minecraft/server/LoginListener.java -index 91b6f1de8..398f67f4b 100644 +index 91b6f1de80..398f67f4b6 100644 --- a/src/main/java/net/minecraft/server/LoginListener.java +++ b/src/main/java/net/minecraft/server/LoginListener.java @@ -242,6 +242,10 @@ public class LoginListener implements PacketLoginInListener { diff --git a/Spigot-Server-Patches/0176-LivingEntity-setKiller.patch b/Spigot-Server-Patches/0176-LivingEntity-setKiller.patch index 5b4b283a17..90bb095360 100644 --- a/Spigot-Server-Patches/0176-LivingEntity-setKiller.patch +++ b/Spigot-Server-Patches/0176-LivingEntity-setKiller.patch @@ -1,11 +1,11 @@ -From 08fc03285cae604c643ec14ea692a7a94946ea70 Mon Sep 17 00:00:00 2001 +From 23033035f1855f36b018d4fd3f2f9d8beb91ac61 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 91d6e3c22..b28e21b92 100644 +index ed528faada..60d365d163 100644 --- a/src/main/java/net/minecraft/server/EntityLiving.java +++ b/src/main/java/net/minecraft/server/EntityLiving.java @@ -76,7 +76,7 @@ public abstract class EntityLiving extends Entity { @@ -18,7 +18,7 @@ index 91d6e3c22..b28e21b92 100644 protected int ticksFarFromPlayer; protected float aT; diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java -index aa50435be..42cc15882 100644 +index aa50435bec..42cc158824 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java @@ -304,6 +304,16 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity { diff --git a/Spigot-Server-Patches/0177-Use-Log4j-IOStreams-to-redirect-System.out-err-to-lo.patch b/Spigot-Server-Patches/0177-Use-Log4j-IOStreams-to-redirect-System.out-err-to-lo.patch index a774a75322..8758816243 100644 --- a/Spigot-Server-Patches/0177-Use-Log4j-IOStreams-to-redirect-System.out-err-to-lo.patch +++ b/Spigot-Server-Patches/0177-Use-Log4j-IOStreams-to-redirect-System.out-err-to-lo.patch @@ -1,4 +1,4 @@ -From 7e2949595248e7d8f8222e0ea14770a8191382ec Mon Sep 17 00:00:00 2001 +From c671235ab46a0cd172550c9ae08c34b20c47b617 Mon Sep 17 00:00:00 2001 From: Minecrell Date: Mon, 18 Sep 2017 12:00:03 +0200 Subject: [PATCH] Use Log4j IOStreams to redirect System.out/err to logger @@ -12,7 +12,7 @@ results in a separate line, even though it should not result in a line break. Log4j's implementation handles it correctly. diff --git a/pom.xml b/pom.xml -index 851646727..ae42b1d66 100644 +index d379d33d15..80359d1bf5 100644 --- a/pom.xml +++ b/pom.xml @@ -63,6 +63,11 @@ @@ -28,7 +28,7 @@ index 851646727..ae42b1d66 100644 org.ow2.asm asm diff --git a/src/main/java/net/minecraft/server/DedicatedServer.java b/src/main/java/net/minecraft/server/DedicatedServer.java -index 37020dcba..c2c676e3b 100644 +index 37020dcba5..c2c676e3bb 100644 --- a/src/main/java/net/minecraft/server/DedicatedServer.java +++ b/src/main/java/net/minecraft/server/DedicatedServer.java @@ -135,8 +135,10 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer diff --git a/Spigot-Server-Patches/0178-Handle-plugin-prefixes-using-Log4J-configuration.patch b/Spigot-Server-Patches/0178-Handle-plugin-prefixes-using-Log4J-configuration.patch index 17d8583aee..30369a2f40 100644 --- a/Spigot-Server-Patches/0178-Handle-plugin-prefixes-using-Log4J-configuration.patch +++ b/Spigot-Server-Patches/0178-Handle-plugin-prefixes-using-Log4J-configuration.patch @@ -1,4 +1,4 @@ -From f1f6daaaaa929959b09f1debda7b34067f28618b Mon Sep 17 00:00:00 2001 +From 29320f67f9eb1bfb477f6977bac0754c2df5d299 Mon Sep 17 00:00:00 2001 From: Minecrell Date: Thu, 21 Sep 2017 16:14:55 +0200 Subject: [PATCH] Handle plugin prefixes using Log4J configuration @@ -15,7 +15,7 @@ This may cause additional prefixes to be disabled for plugins bypassing the plugin logger. diff --git a/pom.xml b/pom.xml -index ae42b1d66..6e4924fff 100644 +index 80359d1bf5..85f005aa99 100644 --- a/pom.xml +++ b/pom.xml @@ -61,7 +61,7 @@ @@ -28,7 +28,7 @@ index ae42b1d66..6e4924fff 100644 org.apache.logging.log4j diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java -index fc6cb9306..bd601333e 100644 +index fc6cb9306a..bd601333ee 100644 --- a/src/main/java/org/spigotmc/SpigotConfig.java +++ b/src/main/java/org/spigotmc/SpigotConfig.java @@ -291,7 +291,7 @@ public class SpigotConfig @@ -41,7 +41,7 @@ index fc6cb9306..bd601333e 100644 public static int playerShuffle; diff --git a/src/main/resources/log4j2.xml b/src/main/resources/log4j2.xml -index 08b6bb7f9..9f8334376 100644 +index 08b6bb7f97..9f8334376f 100644 --- a/src/main/resources/log4j2.xml +++ b/src/main/resources/log4j2.xml @@ -2,10 +2,22 @@ diff --git a/Spigot-Server-Patches/0179-Include-Log4J2-SLF4J-implementation.patch b/Spigot-Server-Patches/0179-Include-Log4J2-SLF4J-implementation.patch index 68a7144e48..4aaafffc6c 100644 --- a/Spigot-Server-Patches/0179-Include-Log4J2-SLF4J-implementation.patch +++ b/Spigot-Server-Patches/0179-Include-Log4J2-SLF4J-implementation.patch @@ -1,11 +1,11 @@ -From c2dd83d35d585049990ef5aea557a3a28941f442 Mon Sep 17 00:00:00 2001 +From ab2375f6aaaba1230bfd3d3e81d676da6c94925d Mon Sep 17 00:00:00 2001 From: Minecrell Date: Thu, 21 Sep 2017 16:33:35 +0200 Subject: [PATCH] Include Log4J2 SLF4J implementation diff --git a/pom.xml b/pom.xml -index 6e4924fff..3d2065fd7 100644 +index 85f005aa99..a10ab7cbb6 100644 --- a/pom.xml +++ b/pom.xml @@ -63,6 +63,12 @@ diff --git a/Spigot-Server-Patches/0180-Disable-logger-prefix-for-various-plugins-bypassing-.patch b/Spigot-Server-Patches/0180-Disable-logger-prefix-for-various-plugins-bypassing-.patch index 7e2a132b34..ba24183538 100644 --- a/Spigot-Server-Patches/0180-Disable-logger-prefix-for-various-plugins-bypassing-.patch +++ b/Spigot-Server-Patches/0180-Disable-logger-prefix-for-various-plugins-bypassing-.patch @@ -1,4 +1,4 @@ -From b4197229bcfa8d2747673bcd169b8eb1b5403044 Mon Sep 17 00:00:00 2001 +From f4dda781700c3c4d4c8b9d1fb250575318287e11 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 9f8334376..6711e6dff 100644 +index 9f8334376f..6711e6dff9 100644 --- a/src/main/resources/log4j2.xml +++ b/src/main/resources/log4j2.xml @@ -5,7 +5,8 @@ diff --git a/Spigot-Server-Patches/0181-Add-PlayerJumpEvent.patch b/Spigot-Server-Patches/0181-Add-PlayerJumpEvent.patch index 97127cc5d2..a486703694 100644 --- a/Spigot-Server-Patches/0181-Add-PlayerJumpEvent.patch +++ b/Spigot-Server-Patches/0181-Add-PlayerJumpEvent.patch @@ -1,11 +1,11 @@ -From ce3de016bdac085c7ebeab5c3493157970c2ba63 Mon Sep 17 00:00:00 2001 +From 1cf6f50a007d9b29d1072fed8375e5a07cd0316e 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 51720a31b..572da14f9 100644 +index 5b888cdaf9..3ba0ca063c 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; diff --git a/Spigot-Server-Patches/0182-handle-PacketPlayInKeepAlive-async.patch b/Spigot-Server-Patches/0182-handle-PacketPlayInKeepAlive-async.patch index eeec9a511f..3192ff07ae 100644 --- a/Spigot-Server-Patches/0182-handle-PacketPlayInKeepAlive-async.patch +++ b/Spigot-Server-Patches/0182-handle-PacketPlayInKeepAlive-async.patch @@ -1,4 +1,4 @@ -From adabfe94483ad3f8f432dda6b901944e6ff013f4 Mon Sep 17 00:00:00 2001 +From de9f796ae730f038adaffdecd93cdf880443eaeb Mon Sep 17 00:00:00 2001 From: Shane Freeder Date: Thu, 5 Oct 2017 01:54:07 +0100 Subject: [PATCH] handle PacketPlayInKeepAlive async diff --git a/Spigot-Server-Patches/0183-Expose-client-protocol-version-and-virtual-host.patch b/Spigot-Server-Patches/0183-Expose-client-protocol-version-and-virtual-host.patch index 258816a25b..18412fa9f3 100644 --- a/Spigot-Server-Patches/0183-Expose-client-protocol-version-and-virtual-host.patch +++ b/Spigot-Server-Patches/0183-Expose-client-protocol-version-and-virtual-host.patch @@ -1,4 +1,4 @@ -From 0c197c28ee88dd5557ab551c4f0608345915a03c Mon Sep 17 00:00:00 2001 +From 7ac04923c1154ab0887ca26fb8823c084b1d7f2b 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 diff --git a/Spigot-Server-Patches/0184-revert-serverside-behavior-of-keepalives.patch b/Spigot-Server-Patches/0184-revert-serverside-behavior-of-keepalives.patch index a8122641c2..8102d6b984 100644 --- a/Spigot-Server-Patches/0184-revert-serverside-behavior-of-keepalives.patch +++ b/Spigot-Server-Patches/0184-revert-serverside-behavior-of-keepalives.patch @@ -1,4 +1,4 @@ -From 88d25dca0531df3fbffe0ddf4868e6cea6ba1b34 Mon Sep 17 00:00:00 2001 +From 5de2cd76419912cb384f46d2d4ba6db6e112ac1c Mon Sep 17 00:00:00 2001 From: Shane Freeder Date: Sun, 15 Oct 2017 00:29:07 +0100 Subject: [PATCH] revert serverside behavior of keepalives @@ -17,7 +17,7 @@ from networking or during connections flood of chunk packets on slower clients, at the cost of dead connections being kept open for longer. diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java -index 61793dd1d..43d760bed 100644 +index a7275e7ef8..22dca3fe68 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 { diff --git a/Spigot-Server-Patches/0185-Send-attack-SoundEffects-only-to-players-who-can-see.patch b/Spigot-Server-Patches/0185-Send-attack-SoundEffects-only-to-players-who-can-see.patch index ab35bc8c92..bb5b6ed7c3 100644 --- a/Spigot-Server-Patches/0185-Send-attack-SoundEffects-only-to-players-who-can-see.patch +++ b/Spigot-Server-Patches/0185-Send-attack-SoundEffects-only-to-players-who-can-see.patch @@ -1,4 +1,4 @@ -From 6bc4623ee2b675436be3fbb00f1374b7f81acf3c Mon Sep 17 00:00:00 2001 +From 383749850f3a3f183371c5c64b948ba013d108da 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 05942fb7e..b97e34163 100644 +index b8fe15f1a1..ec0982b587 100644 --- a/src/main/java/net/minecraft/server/EntityHuman.java +++ b/src/main/java/net/minecraft/server/EntityHuman.java @@ -941,6 +941,15 @@ public abstract class EntityHuman extends EntityLiving { @@ -72,7 +72,7 @@ index 05942fb7e..b97e34163 100644 entity.extinguish(); } diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index 3e5c76d32..80e4b1184 100644 +index 71c4861712..bc847e409c 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -675,6 +675,10 @@ public abstract class World implements IIBlockAccess, GeneratorAccess, AutoClose diff --git a/Spigot-Server-Patches/0186-Option-for-maximum-exp-value-when-merging-orbs.patch b/Spigot-Server-Patches/0186-Option-for-maximum-exp-value-when-merging-orbs.patch index 1c9fecef08..fc0ff89ac7 100644 --- a/Spigot-Server-Patches/0186-Option-for-maximum-exp-value-when-merging-orbs.patch +++ b/Spigot-Server-Patches/0186-Option-for-maximum-exp-value-when-merging-orbs.patch @@ -1,4 +1,4 @@ -From 52d418e7f754f4a6bc2c5d331130fc5a7e6d210d Mon Sep 17 00:00:00 2001 +From 4516acc1a195e86cc8c0c8ba53d2b0c569b7b9c6 Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Fri, 10 Nov 2017 23:03:12 -0500 Subject: [PATCH] Option for maximum exp value when merging orbs diff --git a/Spigot-Server-Patches/0187-Add-PlayerArmorChangeEvent.patch b/Spigot-Server-Patches/0187-Add-PlayerArmorChangeEvent.patch index f54c302768..d6149c6f63 100644 --- a/Spigot-Server-Patches/0187-Add-PlayerArmorChangeEvent.patch +++ b/Spigot-Server-Patches/0187-Add-PlayerArmorChangeEvent.patch @@ -1,11 +1,11 @@ -From e621bc194134d064bbf1fb7c8ee43058ade04750 Mon Sep 17 00:00:00 2001 +From ab5030413d766dcda7867c87ed86058df2b97147 Mon Sep 17 00:00:00 2001 From: pkt77 Date: Fri, 10 Nov 2017 23:46:34 -0500 Subject: [PATCH] Add PlayerArmorChangeEvent diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java -index b23921c625..ea73c8968d 100644 +index 60d365d163..6c75db0ee2 100644 --- a/src/main/java/net/minecraft/server/EntityLiving.java +++ b/src/main/java/net/minecraft/server/EntityLiving.java @@ -1,5 +1,6 @@ diff --git a/Spigot-Server-Patches/0188-Prevent-logins-from-being-processed-when-the-player-.patch b/Spigot-Server-Patches/0188-Prevent-logins-from-being-processed-when-the-player-.patch index 2ce680aa01..5e1d24d1c1 100644 --- a/Spigot-Server-Patches/0188-Prevent-logins-from-being-processed-when-the-player-.patch +++ b/Spigot-Server-Patches/0188-Prevent-logins-from-being-processed-when-the-player-.patch @@ -1,4 +1,4 @@ -From f5872a35462aef5babc7f83861bc66943b3de093 Mon Sep 17 00:00:00 2001 +From d49c7a602c21eb6ab333406d1e329c9cfc9aa778 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 398f67f4b..fe912e0eb 100644 +index 398f67f4b6..fe912e0eb1 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 { diff --git a/Spigot-Server-Patches/0189-use-CB-BlockState-implementations-for-captured-block.patch b/Spigot-Server-Patches/0189-use-CB-BlockState-implementations-for-captured-block.patch index f6306d3bd4..5d7be790ad 100644 --- a/Spigot-Server-Patches/0189-use-CB-BlockState-implementations-for-captured-block.patch +++ b/Spigot-Server-Patches/0189-use-CB-BlockState-implementations-for-captured-block.patch @@ -1,4 +1,4 @@ -From f092b6126dc2cb49cbc28c5eaa33697e792b1ff6 Mon Sep 17 00:00:00 2001 +From f521cea313549b8e060942592f1d8d3d82c3c51f 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 80e4b1184..eed3fa615 100644 +index bc847e409c..d7229f100b 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -352,7 +352,7 @@ public abstract class World implements IIBlockAccess, GeneratorAccess, AutoClose diff --git a/Spigot-Server-Patches/0190-API-to-get-a-BlockState-without-a-snapshot.patch b/Spigot-Server-Patches/0190-API-to-get-a-BlockState-without-a-snapshot.patch index 4fae660f6a..1522dcc7f0 100644 --- a/Spigot-Server-Patches/0190-API-to-get-a-BlockState-without-a-snapshot.patch +++ b/Spigot-Server-Patches/0190-API-to-get-a-BlockState-without-a-snapshot.patch @@ -1,4 +1,4 @@ -From 2e6c0b492bc716a339b1f0a1ebe7609dd7159956 Mon Sep 17 00:00:00 2001 +From d304d51c19fcb787d8feed41d0b827e97bfd900a Mon Sep 17 00:00:00 2001 From: Aikar Date: Mon, 6 Nov 2017 21:08:22 -0500 Subject: [PATCH] API to get a BlockState without a snapshot @@ -13,7 +13,7 @@ also Avoid NPE during CraftBlockEntityState load if could not get TE If Tile Entity was null, correct Sign to return empty lines instead of null diff --git a/src/main/java/net/minecraft/server/TileEntity.java b/src/main/java/net/minecraft/server/TileEntity.java -index 013745f82..9f31f071b 100644 +index 35574a5ef3..acce1788db 100644 --- a/src/main/java/net/minecraft/server/TileEntity.java +++ b/src/main/java/net/minecraft/server/TileEntity.java @@ -236,7 +236,12 @@ public abstract class TileEntity implements KeyedObject { // Paper @@ -39,7 +39,7 @@ index 013745f82..9f31f071b 100644 return null; } diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java b/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java -index 2bc0b2e09..166c918d7 100644 +index 2bc0b2e093..166c918d73 100644 --- a/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java +++ b/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java @@ -312,6 +312,20 @@ public class CraftBlock implements Block { @@ -64,7 +64,7 @@ index 2bc0b2e09..166c918d7 100644 switch (material) { diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftBlockEntityState.java b/src/main/java/org/bukkit/craftbukkit/block/CraftBlockEntityState.java -index d8b3d2f3d..7cb4c3e50 100644 +index d8b3d2f3d5..7cb4c3e503 100644 --- a/src/main/java/org/bukkit/craftbukkit/block/CraftBlockEntityState.java +++ b/src/main/java/org/bukkit/craftbukkit/block/CraftBlockEntityState.java @@ -27,20 +27,40 @@ public class CraftBlockEntityState extends CraftBlockState @@ -114,7 +114,7 @@ index d8b3d2f3d..7cb4c3e50 100644 private T createSnapshot(T tileEntity, World world) { diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftSign.java b/src/main/java/org/bukkit/craftbukkit/block/CraftSign.java -index 15022ada0..af15656cc 100644 +index 15022ada0c..af15656cc4 100644 --- a/src/main/java/org/bukkit/craftbukkit/block/CraftSign.java +++ b/src/main/java/org/bukkit/craftbukkit/block/CraftSign.java @@ -17,10 +17,12 @@ public class CraftSign extends CraftBlockEntityState implements diff --git a/Spigot-Server-Patches/0191-AsyncTabCompleteEvent.patch b/Spigot-Server-Patches/0191-AsyncTabCompleteEvent.patch index 57c3e9c729..c436704939 100644 --- a/Spigot-Server-Patches/0191-AsyncTabCompleteEvent.patch +++ b/Spigot-Server-Patches/0191-AsyncTabCompleteEvent.patch @@ -1,4 +1,4 @@ -From 251bdf8362b4a8e609b22a157e5da5bce19dd103 Mon Sep 17 00:00:00 2001 +From 5123c163149447057fe331ea348cf81040fc8db2 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/0192-Avoid-NPE-in-PathfinderGoalTempt.patch b/Spigot-Server-Patches/0192-Avoid-NPE-in-PathfinderGoalTempt.patch index b9b14f8b90..a2bc04744d 100644 --- a/Spigot-Server-Patches/0192-Avoid-NPE-in-PathfinderGoalTempt.patch +++ b/Spigot-Server-Patches/0192-Avoid-NPE-in-PathfinderGoalTempt.patch @@ -1,11 +1,11 @@ -From 7a96bdd3f46ac6baae6c777bbb16cbda2eb82491 Mon Sep 17 00:00:00 2001 +From 4340e4962c2f80ced76c16b2c2f896880405295f 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 fb395bcde..d1164dd68 100644 +index fb395bcded..d1164dd682 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 { diff --git a/Spigot-Server-Patches/0193-PlayerPickupExperienceEvent.patch b/Spigot-Server-Patches/0193-PlayerPickupExperienceEvent.patch index d6b173ae65..db7439d502 100644 --- a/Spigot-Server-Patches/0193-PlayerPickupExperienceEvent.patch +++ b/Spigot-Server-Patches/0193-PlayerPickupExperienceEvent.patch @@ -1,4 +1,4 @@ -From 5d47fbc07dc301f495e0238f2303c9504b7382c6 Mon Sep 17 00:00:00 2001 +From 939bd1833125612acd9db438d7a63a0b5d9083cc 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 49668f2c2..704a48c8e 100644 +index 49668f2c21..704a48c8ea 100644 --- a/src/main/java/net/minecraft/server/EntityExperienceOrb.java +++ b/src/main/java/net/minecraft/server/EntityExperienceOrb.java @@ -219,7 +219,7 @@ public class EntityExperienceOrb extends Entity { diff --git a/Spigot-Server-Patches/0194-ExperienceOrbMergeEvent.patch b/Spigot-Server-Patches/0194-ExperienceOrbMergeEvent.patch index 477c7b3c78..8a3460d8a6 100644 --- a/Spigot-Server-Patches/0194-ExperienceOrbMergeEvent.patch +++ b/Spigot-Server-Patches/0194-ExperienceOrbMergeEvent.patch @@ -1,4 +1,4 @@ -From 729de1eed94305f43f0b7c4d8321893b4db384bd Mon Sep 17 00:00:00 2001 +From 38bc1e42528cda4da26bbfc0a73d6f95569d5438 Mon Sep 17 00:00:00 2001 From: Aikar Date: Tue, 19 Dec 2017 22:57:26 -0500 Subject: [PATCH] ExperienceOrbMergeEvent diff --git a/Spigot-Server-Patches/0195-Ability-to-apply-mending-to-XP-API.patch b/Spigot-Server-Patches/0195-Ability-to-apply-mending-to-XP-API.patch index 4586acd4ea..46e1bd5da9 100644 --- a/Spigot-Server-Patches/0195-Ability-to-apply-mending-to-XP-API.patch +++ b/Spigot-Server-Patches/0195-Ability-to-apply-mending-to-XP-API.patch @@ -1,4 +1,4 @@ -From b936f03abebb6c6cd75a8f359cbdae6968d6c3a3 Mon Sep 17 00:00:00 2001 +From 21196697db8efa5dc67409770e9d6ea354790f31 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 6f64b8db3..b6a40e22a 100644 +index 6f64b8db3a..b6a40e22a8 100644 --- a/src/main/java/net/minecraft/server/EnchantmentManager.java +++ b/src/main/java/net/minecraft/server/EnchantmentManager.java @@ -241,6 +241,11 @@ public class EnchantmentManager { @@ -26,7 +26,7 @@ index 6f64b8db3..b6a40e22a 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 704a48c8e..64d71a9a2 100644 +index 704a48c8ea..64d71a9a2a 100644 --- a/src/main/java/net/minecraft/server/EntityExperienceOrb.java +++ b/src/main/java/net/minecraft/server/EntityExperienceOrb.java @@ -251,10 +251,12 @@ public class EntityExperienceOrb extends Entity { @@ -43,7 +43,7 @@ index 704a48c8e..64d71a9a2 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 0e0421a22..4fa554b29 100644 +index 0e0421a225..4fa554b299 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -1053,8 +1053,39 @@ public class CraftPlayer extends CraftHumanEntity implements Player { diff --git a/Spigot-Server-Patches/0196-Make-max-squid-spawn-height-configurable.patch b/Spigot-Server-Patches/0196-Make-max-squid-spawn-height-configurable.patch index c86fe242be..91c579f550 100644 --- a/Spigot-Server-Patches/0196-Make-max-squid-spawn-height-configurable.patch +++ b/Spigot-Server-Patches/0196-Make-max-squid-spawn-height-configurable.patch @@ -1,4 +1,4 @@ -From 0dc4abf28b9814de7d311c672f52d0a28fc22057 Mon Sep 17 00:00:00 2001 +From c84262ecfc95b6c0c05a2b997cdf4f426c4e57d5 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 2a50d6bab..c3e61bdfe 100644 +index 2a50d6babf..c3e61bdfe3 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java @@ -344,4 +344,9 @@ public class PaperWorldConfig { @@ -21,7 +21,7 @@ index 2a50d6bab..c3e61bdfe 100644 + } } diff --git a/src/main/java/net/minecraft/server/EntitySquid.java b/src/main/java/net/minecraft/server/EntitySquid.java -index 815844dab..d5dff4b88 100644 +index 815844dab2..d5dff4b88c 100644 --- a/src/main/java/net/minecraft/server/EntitySquid.java +++ b/src/main/java/net/minecraft/server/EntitySquid.java @@ -170,7 +170,8 @@ public class EntitySquid extends EntityWaterAnimal { diff --git a/Spigot-Server-Patches/0197-PreCreatureSpawnEvent.patch b/Spigot-Server-Patches/0197-PreCreatureSpawnEvent.patch index bf1dcc869b..b37a811028 100644 --- a/Spigot-Server-Patches/0197-PreCreatureSpawnEvent.patch +++ b/Spigot-Server-Patches/0197-PreCreatureSpawnEvent.patch @@ -1,4 +1,4 @@ -From c5e3b702cf65b17d698c24701f07f1b2bed64823 Mon Sep 17 00:00:00 2001 +From 3a602518368debf6c8527a47807a9f05010d1659 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/EntityTypes.java b/src/main/java/net/minecraft/server/EntityTypes.java -index 98eb0d24c..77d4bbce1 100644 +index 98eb0d24cc..77d4bbce19 100644 --- a/src/main/java/net/minecraft/server/EntityTypes.java +++ b/src/main/java/net/minecraft/server/EntityTypes.java @@ -271,6 +271,7 @@ public class EntityTypes { @@ -27,7 +27,7 @@ index 98eb0d24c..77d4bbce1 100644 if (this.bg == null) { MinecraftKey minecraftkey = IRegistry.ENTITY_TYPE.getKey(this); diff --git a/src/main/java/net/minecraft/server/MobSpawnerAbstract.java b/src/main/java/net/minecraft/server/MobSpawnerAbstract.java -index 93fad14d3..55764deec 100644 +index 93fad14d3f..55764deec4 100644 --- a/src/main/java/net/minecraft/server/MobSpawnerAbstract.java +++ b/src/main/java/net/minecraft/server/MobSpawnerAbstract.java @@ -103,6 +103,27 @@ public abstract class MobSpawnerAbstract { @@ -59,7 +59,7 @@ index 93fad14d3..55764deec 100644 Entity entity = EntityTypes.a(nbttagcompound, world, (entity1) -> { entity1.setPositionRotation(d3, d4, d5, entity1.yaw, entity1.pitch); diff --git a/src/main/java/net/minecraft/server/SpawnerCreature.java b/src/main/java/net/minecraft/server/SpawnerCreature.java -index cbf05926a..14e2f3ca7 100644 +index f4f842b863..5da0f2211b 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 { diff --git a/Spigot-Server-Patches/0198-PlayerNaturallySpawnCreaturesEvent.patch b/Spigot-Server-Patches/0198-PlayerNaturallySpawnCreaturesEvent.patch index a1e4c81e02..9f4b6eb852 100644 --- a/Spigot-Server-Patches/0198-PlayerNaturallySpawnCreaturesEvent.patch +++ b/Spigot-Server-Patches/0198-PlayerNaturallySpawnCreaturesEvent.patch @@ -1,4 +1,4 @@ -From 2233464aa54f578f003c64beb1cb9ad36460e64e Mon Sep 17 00:00:00 2001 +From e049f5b213b198902b0407e9e9c15cd5c2569034 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sun, 14 Jan 2018 17:36:02 -0500 Subject: [PATCH] PlayerNaturallySpawnCreaturesEvent diff --git a/Spigot-Server-Patches/0199-Add-setPlayerProfile-API-for-Skulls.patch b/Spigot-Server-Patches/0199-Add-setPlayerProfile-API-for-Skulls.patch index 3fab3d366b..55d66d90d4 100644 --- a/Spigot-Server-Patches/0199-Add-setPlayerProfile-API-for-Skulls.patch +++ b/Spigot-Server-Patches/0199-Add-setPlayerProfile-API-for-Skulls.patch @@ -1,4 +1,4 @@ -From 350a1c89cdd732572904ea9abead1257c0a63777 Mon Sep 17 00:00:00 2001 +From 172e91f22667b76bd0256e2c32f43aeac98d3d1f 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 a4bc7f970..2dd2f476f 100644 +index a4bc7f9701..2dd2f476f0 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 a4bc7f970..2dd2f476f 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 0136e1bfe..aee97b9f0 100644 +index 0136e1bfe1..aee97b9f03 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; diff --git a/Spigot-Server-Patches/0200-Fill-Profile-Property-Events.patch b/Spigot-Server-Patches/0200-Fill-Profile-Property-Events.patch index e77fe8f1e6..52763a4752 100644 --- a/Spigot-Server-Patches/0200-Fill-Profile-Property-Events.patch +++ b/Spigot-Server-Patches/0200-Fill-Profile-Property-Events.patch @@ -1,4 +1,4 @@ -From d300db084daf942cbdca05c47603970b777ba751 Mon Sep 17 00:00:00 2001 +From 233b93f5f6a9b4620e20db765056be872f8c2c76 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 4b2a67423..61cfdf73c 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 @@ diff --git a/Spigot-Server-Patches/0201-PlayerAdvancementCriterionGrantEvent.patch b/Spigot-Server-Patches/0201-PlayerAdvancementCriterionGrantEvent.patch index 0dd4dfe67c..1c471645e5 100644 --- a/Spigot-Server-Patches/0201-PlayerAdvancementCriterionGrantEvent.patch +++ b/Spigot-Server-Patches/0201-PlayerAdvancementCriterionGrantEvent.patch @@ -1,11 +1,11 @@ -From 13869858a3cb2dbe588c58079dc6cc83b3ba6c87 Mon Sep 17 00:00:00 2001 +From 8f33f91b12c53933a978bf85f91b8176d7043416 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 f751c30cf..593979152 100644 +index c254b73992..a284a940ef 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 { diff --git a/Spigot-Server-Patches/0202-Add-ArmorStand-Item-Meta.patch b/Spigot-Server-Patches/0202-Add-ArmorStand-Item-Meta.patch index bd31245100..e935dab05a 100644 --- a/Spigot-Server-Patches/0202-Add-ArmorStand-Item-Meta.patch +++ b/Spigot-Server-Patches/0202-Add-ArmorStand-Item-Meta.patch @@ -1,4 +1,4 @@ -From 76e612ae800a3ee57b272e1997e561f82381db02 Mon Sep 17 00:00:00 2001 +From f49debe712836c65daa9ea88fb5c196ac3fee481 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/CraftItemFactory.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java -index 929d73692..df70c5c0e 100644 +index 929d73692a..df70c5c0ef 100644 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java @@ -194,6 +194,8 @@ public final class CraftItemFactory implements ItemFactory { @@ -26,7 +26,7 @@ index 929d73692..df70c5c0e 100644 case CHEST: case TRAPPED_CHEST: diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java -index 00497350a..88154d2f2 100644 +index 00497350a3..88154d2f23 100644 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java @@ -395,6 +395,8 @@ public final class CraftItemStack extends ItemStack { @@ -40,7 +40,7 @@ index 00497350a..88154d2f2 100644 case TRAPPED_CHEST: diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaArmorStand.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaArmorStand.java new file mode 100644 -index 000000000..c00b89c8d +index 0000000000..c00b89c8d4 --- /dev/null +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaArmorStand.java @@ -0,0 +1,311 @@ @@ -356,7 +356,7 @@ index 000000000..c00b89c8d + } +} diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java -index bf7b226a4..a8b267487 100644 +index bf7b226a4f..a8b267487f 100644 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java @@ -161,6 +161,7 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta { @@ -385,7 +385,7 @@ index bf7b226a4..a8b267487 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 6abde9030..2a0852675 100644 +index 6abde9030d..2a0852675b 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; diff --git a/Spigot-Server-Patches/0203-Extend-Player-Interact-cancellation.patch b/Spigot-Server-Patches/0203-Extend-Player-Interact-cancellation.patch index 1ddc955783..0877c50e86 100644 --- a/Spigot-Server-Patches/0203-Extend-Player-Interact-cancellation.patch +++ b/Spigot-Server-Patches/0203-Extend-Player-Interact-cancellation.patch @@ -1,4 +1,4 @@ -From d239fb6d181f735359b93aae0112d80522551540 Mon Sep 17 00:00:00 2001 +From 47b83bb10244e967d553a6789f0c2e2eceba001e 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 a7411c75a..f692da609 100644 +index ff8b11e7ea..06ea3899a6 100644 --- a/src/main/java/net/minecraft/server/PlayerInteractManager.java +++ b/src/main/java/net/minecraft/server/PlayerInteractManager.java @@ -111,6 +111,11 @@ public class PlayerInteractManager { diff --git a/Spigot-Server-Patches/0204-Tameable-getOwnerUniqueId-API.patch b/Spigot-Server-Patches/0204-Tameable-getOwnerUniqueId-API.patch index d26f0ce554..8331816a70 100644 --- a/Spigot-Server-Patches/0204-Tameable-getOwnerUniqueId-API.patch +++ b/Spigot-Server-Patches/0204-Tameable-getOwnerUniqueId-API.patch @@ -1,4 +1,4 @@ -From d0b71980f779cace8fb05ad100382a8457ed0eee Mon Sep 17 00:00:00 2001 +From 7fc91406986ddca0d89bdf4a56fa44f3d1bc081f Mon Sep 17 00:00:00 2001 From: Aikar Date: Sat, 24 Feb 2018 01:14:55 -0500 Subject: [PATCH] Tameable#getOwnerUniqueId API @@ -7,7 +7,7 @@ This is faster if all you need is the UUID, as .getOwner() will cause an OfflinePlayer to be loaded from disk. diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftAbstractHorse.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftAbstractHorse.java -index 9952db3eb..1aea5f3f0 100644 +index 9952db3eb5..1aea5f3f05 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftAbstractHorse.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftAbstractHorse.java @@ -90,6 +90,9 @@ public abstract class CraftAbstractHorse extends CraftAnimals implements Abstrac @@ -21,7 +21,7 @@ index 9952db3eb..1aea5f3f0 100644 return getHandle().getOwnerUUID(); } diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftTameableAnimal.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftTameableAnimal.java -index 5dfa40dda..407b95caf 100644 +index 5dfa40dda1..407b95cafd 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftTameableAnimal.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftTameableAnimal.java @@ -17,6 +17,9 @@ public class CraftTameableAnimal extends CraftAnimals implements Tameable, Creat diff --git a/Spigot-Server-Patches/0205-Toggleable-player-crits-helps-mitigate-hacked-client.patch b/Spigot-Server-Patches/0205-Toggleable-player-crits-helps-mitigate-hacked-client.patch index a9177a8a98..33eccba864 100644 --- a/Spigot-Server-Patches/0205-Toggleable-player-crits-helps-mitigate-hacked-client.patch +++ b/Spigot-Server-Patches/0205-Toggleable-player-crits-helps-mitigate-hacked-client.patch @@ -1,11 +1,11 @@ -From 9c9cea700073fb5db72d186b593c9e14016dcb6a Mon Sep 17 00:00:00 2001 +From 2c8ce948b5bdf4d1128f4be30f8d9d23ab9b5bb8 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 c3e61bdfe..32bfe0e46 100644 +index c3e61bdfe3..32bfe0e462 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java @@ -182,6 +182,11 @@ public class PaperWorldConfig { @@ -21,7 +21,7 @@ index c3e61bdfe..32bfe0e46 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 b97e34163..14c44a360 100644 +index ec0982b587..cc9b265182 100644 --- a/src/main/java/net/minecraft/server/EntityHuman.java +++ b/src/main/java/net/minecraft/server/EntityHuman.java @@ -981,6 +981,7 @@ public abstract class EntityHuman extends EntityLiving { diff --git a/Spigot-Server-Patches/0206-Fix-NPE-when-getting-location-from-InventoryEnderChe.patch b/Spigot-Server-Patches/0206-Fix-NPE-when-getting-location-from-InventoryEnderChe.patch index a659b347ca..8c1ecb60ac 100644 --- a/Spigot-Server-Patches/0206-Fix-NPE-when-getting-location-from-InventoryEnderChe.patch +++ b/Spigot-Server-Patches/0206-Fix-NPE-when-getting-location-from-InventoryEnderChe.patch @@ -1,4 +1,4 @@ -From 62d13da4f1288d50d15c2d1b5bcf1f2a9c237e8f Mon Sep 17 00:00:00 2001 +From cab6a4e013dc2c1da4a3f33338b950dee32494ba 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 343670b20..6960ad433 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; diff --git a/Spigot-Server-Patches/0207-Prevent-Frosted-Ice-from-loading-holding-chunks.patch b/Spigot-Server-Patches/0207-Prevent-Frosted-Ice-from-loading-holding-chunks.patch index 8f707da3bb..7d996360ce 100644 --- a/Spigot-Server-Patches/0207-Prevent-Frosted-Ice-from-loading-holding-chunks.patch +++ b/Spigot-Server-Patches/0207-Prevent-Frosted-Ice-from-loading-holding-chunks.patch @@ -1,11 +1,11 @@ -From b1f2876582b31afb35a34d8bac104d854c3afa1b Mon Sep 17 00:00:00 2001 +From f838e1b0922c03e717fde8c9edee438dbd239e34 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 39c3bbc9c..881dfb123 100644 +index 39c3bbc9cf..881dfb1235 100644 --- a/src/main/java/net/minecraft/server/BlockIceFrost.java +++ b/src/main/java/net/minecraft/server/BlockIceFrost.java @@ -26,7 +26,8 @@ public class BlockIceFrost extends BlockIce { diff --git a/Spigot-Server-Patches/0208-Disable-Explicit-Network-Manager-Flushing.patch b/Spigot-Server-Patches/0208-Disable-Explicit-Network-Manager-Flushing.patch index 6f45e50f4c..96c91a7189 100644 --- a/Spigot-Server-Patches/0208-Disable-Explicit-Network-Manager-Flushing.patch +++ b/Spigot-Server-Patches/0208-Disable-Explicit-Network-Manager-Flushing.patch @@ -1,4 +1,4 @@ -From 513e37fb92321b4b4a7a0d47a2fb470eaf3bda93 Mon Sep 17 00:00:00 2001 +From 7c23b8436c687aaee064e6e31972f9f10b8b3c5c 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 5d5e23c18..6c5544807 100644 +index ae60f757e3..efd02bd67d 100644 --- a/src/main/java/net/minecraft/server/NetworkManager.java +++ b/src/main/java/net/minecraft/server/NetworkManager.java @@ -65,6 +65,7 @@ public class NetworkManager extends SimpleChannelInboundHandler> { diff --git a/Spigot-Server-Patches/0209-Implement-extended-PaperServerListPingEvent.patch b/Spigot-Server-Patches/0209-Implement-extended-PaperServerListPingEvent.patch index 8734f90b7d..8bacda0c98 100644 --- a/Spigot-Server-Patches/0209-Implement-extended-PaperServerListPingEvent.patch +++ b/Spigot-Server-Patches/0209-Implement-extended-PaperServerListPingEvent.patch @@ -1,4 +1,4 @@ -From 23a98f20471a931dadc359fd9451cac5319e372d Mon Sep 17 00:00:00 2001 +From 88ced08f110ab4c100dfb2e3528094c9f4ee7462 Mon Sep 17 00:00:00 2001 From: Minecrell Date: Wed, 11 Oct 2017 15:56:26 +0200 Subject: [PATCH] Implement extended PaperServerListPingEvent @@ -6,7 +6,7 @@ Subject: [PATCH] Implement extended PaperServerListPingEvent diff --git a/src/main/java/com/destroystokyo/paper/network/PaperServerListPingEventImpl.java b/src/main/java/com/destroystokyo/paper/network/PaperServerListPingEventImpl.java new file mode 100644 -index 000000000..c1a8e295b +index 0000000000..c1a8e295b6 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/network/PaperServerListPingEventImpl.java @@ -0,0 +1,31 @@ @@ -43,7 +43,7 @@ index 000000000..c1a8e295b +} diff --git a/src/main/java/com/destroystokyo/paper/network/PaperStatusClient.java b/src/main/java/com/destroystokyo/paper/network/PaperStatusClient.java new file mode 100644 -index 000000000..a2a409e63 +index 0000000000..a2a409e635 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/network/PaperStatusClient.java @@ -0,0 +1,11 @@ @@ -60,7 +60,7 @@ index 000000000..a2a409e63 +} diff --git a/src/main/java/com/destroystokyo/paper/network/StandardPaperServerListPingEventImpl.java b/src/main/java/com/destroystokyo/paper/network/StandardPaperServerListPingEventImpl.java new file mode 100644 -index 000000000..a85466bc7 +index 0000000000..a85466bc7e --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/network/StandardPaperServerListPingEventImpl.java @@ -0,0 +1,112 @@ @@ -177,7 +177,7 @@ index 000000000..a85466bc7 + +} diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 5817e9452..7e27f1079 100644 +index 5817e94525..7e27f10790 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -1,6 +1,7 @@ @@ -198,7 +198,7 @@ index 5817e9452..7e27f1079 100644 for (int k = 0; k < agameprofile.length; ++k) { diff --git a/src/main/java/net/minecraft/server/PacketStatusListener.java b/src/main/java/net/minecraft/server/PacketStatusListener.java -index b247a18b9..ba1c76c1a 100644 +index b247a18b9e..ba1c76c1a5 100644 --- a/src/main/java/net/minecraft/server/PacketStatusListener.java +++ b/src/main/java/net/minecraft/server/PacketStatusListener.java @@ -32,6 +32,8 @@ public class PacketStatusListener implements PacketStatusInListener { @@ -221,7 +221,7 @@ index b247a18b9..ba1c76c1a 100644 // CraftBukkit end } diff --git a/src/main/java/net/minecraft/server/ServerPing.java b/src/main/java/net/minecraft/server/ServerPing.java -index aa125a52d..ea52e89bd 100644 +index aa125a52dc..ea52e89bd9 100644 --- a/src/main/java/net/minecraft/server/ServerPing.java +++ b/src/main/java/net/minecraft/server/ServerPing.java @@ -29,6 +29,7 @@ public class ServerPing { @@ -246,7 +246,7 @@ index aa125a52d..ea52e89bd 100644 this.c = agameprofile; } diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java -index bd601333e..6c5430ff9 100644 +index bd601333ee..6c5430ff94 100644 --- a/src/main/java/org/spigotmc/SpigotConfig.java +++ b/src/main/java/org/spigotmc/SpigotConfig.java @@ -290,7 +290,7 @@ public class SpigotConfig diff --git a/Spigot-Server-Patches/0210-Improved-Async-Task-Scheduler.patch b/Spigot-Server-Patches/0210-Improved-Async-Task-Scheduler.patch index 7a8c53ae11..aa0cc607c9 100644 --- a/Spigot-Server-Patches/0210-Improved-Async-Task-Scheduler.patch +++ b/Spigot-Server-Patches/0210-Improved-Async-Task-Scheduler.patch @@ -1,4 +1,4 @@ -From 51a1b2fdfcfd901bcbb703965cb9e71815229d28 Mon Sep 17 00:00:00 2001 +From 743e19fff0dc63a829cf1cf3814ff670c6c6cde4 Mon Sep 17 00:00:00 2001 From: Aikar Date: Fri, 16 Mar 2018 22:59:43 -0400 Subject: [PATCH] Improved Async Task Scheduler @@ -32,7 +32,7 @@ operations are decoupled from the sync tasks queue. diff --git a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftAsyncScheduler.java b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftAsyncScheduler.java new file mode 100644 -index 000000000..3c1992e21 +index 0000000000..3c1992e212 --- /dev/null +++ b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftAsyncScheduler.java @@ -0,0 +1,122 @@ @@ -159,7 +159,7 @@ index 000000000..3c1992e21 + } +} diff --git a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java -index e102be583..5db848de1 100644 +index e102be583c..5db848de14 100644 --- a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java +++ b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java @@ -62,7 +62,7 @@ public class CraftScheduler implements BukkitScheduler { diff --git a/Spigot-Server-Patches/0211-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch b/Spigot-Server-Patches/0211-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch index 0ee2acd2c4..cc5e93eae1 100644 --- a/Spigot-Server-Patches/0211-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch +++ b/Spigot-Server-Patches/0211-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch @@ -1,4 +1,4 @@ -From ea4fc54b91e1b7089cfec2ab28a24a428c822bf3 Mon Sep 17 00:00:00 2001 +From da97d53c161945f66627f2398e6b5c14887a3ad4 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 fe912e0eb..7c3b9c0b9 100644 +index fe912e0eb1..7c3b9c0b97 100644 --- a/src/main/java/net/minecraft/server/LoginListener.java +++ b/src/main/java/net/minecraft/server/LoginListener.java @@ -1,5 +1,7 @@ diff --git a/Spigot-Server-Patches/0212-Player.setPlayerProfile-API.patch b/Spigot-Server-Patches/0212-Player.setPlayerProfile-API.patch index 5300145337..5aabaab973 100644 --- a/Spigot-Server-Patches/0212-Player.setPlayerProfile-API.patch +++ b/Spigot-Server-Patches/0212-Player.setPlayerProfile-API.patch @@ -1,4 +1,4 @@ -From 5071cf8eaa93f16225860890465a996e7f5a0701 Mon Sep 17 00:00:00 2001 +From 7a8800a2a231b1801480138381eb87d358cb85b4 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 14c44a360..23a2f92f2 100644 +index cc9b265182..f4f1037b3d 100644 --- a/src/main/java/net/minecraft/server/EntityHuman.java +++ b/src/main/java/net/minecraft/server/EntityHuman.java @@ -65,7 +65,7 @@ public abstract class EntityHuman extends EntityLiving { @@ -19,7 +19,7 @@ index 14c44a360..23a2f92f2 100644 private final ItemCooldown bY; @Nullable diff --git a/src/main/java/net/minecraft/server/LoginListener.java b/src/main/java/net/minecraft/server/LoginListener.java -index 7c3b9c0b9..d4d752ddb 100644 +index 7c3b9c0b97..d4d752ddb4 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 7c3b9c0b9..d4d752ddb 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 4fa554b29..35cacb3d2 100644 +index 4fa554b299..35cacb3d29 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 @@ diff --git a/Spigot-Server-Patches/0213-Fix-Dragon-Server-Crashes.patch b/Spigot-Server-Patches/0213-Fix-Dragon-Server-Crashes.patch index 9e094a88b9..d593e2fc48 100644 --- a/Spigot-Server-Patches/0213-Fix-Dragon-Server-Crashes.patch +++ b/Spigot-Server-Patches/0213-Fix-Dragon-Server-Crashes.patch @@ -1,4 +1,4 @@ -From 29900b9f545b9f8ecc624fd5bcbc34fbac0f6206 Mon Sep 17 00:00:00 2001 +From 420ea51b5e4065e2134144c24e035d99e88af17d 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 cfe84f4d4..4ab310cd6 100644 +index cfe84f4d48..4ab310cd6b 100644 --- a/src/main/java/net/minecraft/server/DragonControllerLandedFlame.java +++ b/src/main/java/net/minecraft/server/DragonControllerLandedFlame.java @@ -53,7 +53,7 @@ public class DragonControllerLandedFlame extends AbstractDragonControllerLanded diff --git a/Spigot-Server-Patches/0214-getPlayerUniqueId-API.patch b/Spigot-Server-Patches/0214-getPlayerUniqueId-API.patch index 954223ad76..93f406374d 100644 --- a/Spigot-Server-Patches/0214-getPlayerUniqueId-API.patch +++ b/Spigot-Server-Patches/0214-getPlayerUniqueId-API.patch @@ -1,4 +1,4 @@ -From 272bed4023311ec64b7a6756561e374583ad49a3 Mon Sep 17 00:00:00 2001 +From a415f02aa3578a2d936b7a75bbc316f90124bd97 Mon Sep 17 00:00:00 2001 From: Aikar Date: Thu, 22 Mar 2018 01:40:24 -0400 Subject: [PATCH] getPlayerUniqueId API @@ -9,7 +9,7 @@ In Offline Mode, will return an Offline UUID This is a more performant way to obtain a UUID for a name than loading an OfflinePlayer diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 746d2888d..ad1950980 100644 +index 5e9e601bf4..f6c5a9c364 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -1355,6 +1355,26 @@ public final class CraftServer implements Server { diff --git a/Spigot-Server-Patches/0215-Make-player-data-saving-configurable.patch b/Spigot-Server-Patches/0215-Make-player-data-saving-configurable.patch index e527d7cfa9..d42d63d642 100644 --- a/Spigot-Server-Patches/0215-Make-player-data-saving-configurable.patch +++ b/Spigot-Server-Patches/0215-Make-player-data-saving-configurable.patch @@ -1,11 +1,11 @@ -From 49fcbc988197de97e26d7a0cbc43168c7f75a2bd Mon Sep 17 00:00:00 2001 +From 5c793409f8b75a1948145805f907199b68bbf142 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 f4d089f3e..a186b6eb0 100644 +index f4d089f3ef..a186b6eb01 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 f4d089f3e..a186b6eb0 100644 + } } diff --git a/src/main/java/net/minecraft/server/WorldNBTStorage.java b/src/main/java/net/minecraft/server/WorldNBTStorage.java -index a0254d8e5..e60e10c57 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 { diff --git a/Spigot-Server-Patches/0216-Make-legacy-ping-handler-more-reliable.patch b/Spigot-Server-Patches/0216-Make-legacy-ping-handler-more-reliable.patch index 003a96c2e7..d65ab4af09 100644 --- a/Spigot-Server-Patches/0216-Make-legacy-ping-handler-more-reliable.patch +++ b/Spigot-Server-Patches/0216-Make-legacy-ping-handler-more-reliable.patch @@ -1,4 +1,4 @@ -From 72579d1ab6f3a011aaab13e2f90e3c2c89eef08e Mon Sep 17 00:00:00 2001 +From b521b6afdd5f6f48f2407611d951aeb84818551c 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 diff --git a/Spigot-Server-Patches/0217-Call-PaperServerListPingEvent-for-legacy-pings.patch b/Spigot-Server-Patches/0217-Call-PaperServerListPingEvent-for-legacy-pings.patch index 67e6c5e1e3..dea17e8213 100644 --- a/Spigot-Server-Patches/0217-Call-PaperServerListPingEvent-for-legacy-pings.patch +++ b/Spigot-Server-Patches/0217-Call-PaperServerListPingEvent-for-legacy-pings.patch @@ -1,4 +1,4 @@ -From 5304f244db7d7682e655cc80b677b9d6d24229e3 Mon Sep 17 00:00:00 2001 +From 176749d87ecaf2d8ea70779a6427107581ac95e6 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 diff --git a/Spigot-Server-Patches/0218-Flag-to-disable-the-channel-limit.patch b/Spigot-Server-Patches/0218-Flag-to-disable-the-channel-limit.patch index ed4e9b270d..6b2124320d 100644 --- a/Spigot-Server-Patches/0218-Flag-to-disable-the-channel-limit.patch +++ b/Spigot-Server-Patches/0218-Flag-to-disable-the-channel-limit.patch @@ -1,4 +1,4 @@ -From 2183732c4ccd68294c1567f64cdf528dbd53ac5a Mon Sep 17 00:00:00 2001 +From c756ea7cf6b754c4cb8feeb1498d9904f1608f2c 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 35cacb3d2..be7c5d174 100644 +index 35cacb3d29..be7c5d1747 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -136,6 +136,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player { diff --git a/Spigot-Server-Patches/0219-Add-method-to-open-already-placed-sign.patch b/Spigot-Server-Patches/0219-Add-method-to-open-already-placed-sign.patch index 879482db2d..de4b0f1d93 100644 --- a/Spigot-Server-Patches/0219-Add-method-to-open-already-placed-sign.patch +++ b/Spigot-Server-Patches/0219-Add-method-to-open-already-placed-sign.patch @@ -1,11 +1,11 @@ -From d1b141797220036ffea3ebe16dc6d86302cab4b7 Mon Sep 17 00:00:00 2001 +From 736e36861fb75292d16f3b8fd3f98bc4a9c43000 Mon Sep 17 00:00:00 2001 From: Mark Vainomaa Date: Sun, 1 Apr 2018 02:29:37 +0300 Subject: [PATCH] Add method to open already placed sign diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java -index bb4dde0de..60f839056 100644 +index bb4dde0de0..60f839056b 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java @@ -759,4 +759,17 @@ public class CraftHumanEntity extends CraftLivingEntity implements HumanEntity { diff --git a/Spigot-Server-Patches/0220-Configurable-sprint-interruption-on-attack.patch b/Spigot-Server-Patches/0220-Configurable-sprint-interruption-on-attack.patch index 35ef5eddb9..47a73f61a7 100644 --- a/Spigot-Server-Patches/0220-Configurable-sprint-interruption-on-attack.patch +++ b/Spigot-Server-Patches/0220-Configurable-sprint-interruption-on-attack.patch @@ -1,4 +1,4 @@ -From ffb2dc40daa5cc08ed8e08a261d19946bde4d517 Mon Sep 17 00:00:00 2001 +From 1c4c70cee0e81953eaa61302ec08a5e480674be2 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 32bfe0e46..7024336c3 100644 +index 32bfe0e462..7024336c3a 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java @@ -354,4 +354,9 @@ public class PaperWorldConfig { @@ -20,7 +20,7 @@ index 32bfe0e46..7024336c3 100644 + } } diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java -index 23a2f92f2..58d2a28a4 100644 +index f4f1037b3d..9abdf8b24b 100644 --- a/src/main/java/net/minecraft/server/EntityHuman.java +++ b/src/main/java/net/minecraft/server/EntityHuman.java @@ -1030,7 +1030,11 @@ public abstract class EntityHuman extends EntityLiving { diff --git a/Spigot-Server-Patches/0221-Fix-exploit-that-allowed-colored-signs-to-be-created.patch b/Spigot-Server-Patches/0221-Fix-exploit-that-allowed-colored-signs-to-be-created.patch index fed6a98d81..97080aebb2 100644 --- a/Spigot-Server-Patches/0221-Fix-exploit-that-allowed-colored-signs-to-be-created.patch +++ b/Spigot-Server-Patches/0221-Fix-exploit-that-allowed-colored-signs-to-be-created.patch @@ -1,4 +1,4 @@ -From e67ace0e930ce0bb0ed42253c1de21107ba11d4b Mon Sep 17 00:00:00 2001 +From 286f213a3ac5c5da74b83be2c9b675e72b7b9135 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/Spigot-Server-Patches/0222-EndermanEscapeEvent.patch b/Spigot-Server-Patches/0222-EndermanEscapeEvent.patch index 1930fa14d4..0895d86693 100644 --- a/Spigot-Server-Patches/0222-EndermanEscapeEvent.patch +++ b/Spigot-Server-Patches/0222-EndermanEscapeEvent.patch @@ -1,4 +1,4 @@ -From 27db11cf803d6f4354cef0a2c77d43dea2fcfeb1 Mon Sep 17 00:00:00 2001 +From 166a976886347571447e32ad5e7b42e3dc3e6e37 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 ae198f3b9..28184fb36 100644 +index 9d7c16dbfc..93f66181bf 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; diff --git a/Spigot-Server-Patches/0223-Enderman.teleportRandomly.patch b/Spigot-Server-Patches/0223-Enderman.teleportRandomly.patch index 05430c546b..35a30a33b6 100644 --- a/Spigot-Server-Patches/0223-Enderman.teleportRandomly.patch +++ b/Spigot-Server-Patches/0223-Enderman.teleportRandomly.patch @@ -1,4 +1,4 @@ -From fa54fe81ecae1320f93493f4ab09155607ebeb84 Mon Sep 17 00:00:00 2001 +From 16cda57f547d9bef2e264a9f245708266989ca1b 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 28184fb36..d0fb14992 100644 +index 93f66181bf..d9288ad44b 100644 --- a/src/main/java/net/minecraft/server/EntityEnderman.java +++ b/src/main/java/net/minecraft/server/EntityEnderman.java @@ -190,6 +190,7 @@ public class EntityEnderman extends EntityMonster { @@ -18,7 +18,7 @@ index 28184fb36..d0fb14992 100644 double d0 = this.locX + (this.random.nextDouble() - 0.5D) * 64.0D; double d1 = this.locY + (double) (this.random.nextInt(64) - 32); diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEnderman.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEnderman.java -index 970efabd3..0c5f35934 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 { diff --git a/Spigot-Server-Patches/0224-Block-Enderpearl-Travel-Exploit.patch b/Spigot-Server-Patches/0224-Block-Enderpearl-Travel-Exploit.patch index b269f2ba1e..65a1e65fd6 100644 --- a/Spigot-Server-Patches/0224-Block-Enderpearl-Travel-Exploit.patch +++ b/Spigot-Server-Patches/0224-Block-Enderpearl-Travel-Exploit.patch @@ -1,4 +1,4 @@ -From cde906c641086a32658d0ee9f69374581e984215 Mon Sep 17 00:00:00 2001 +From 1d2101b3f0184290f766e8440432d3f0a89ae04f 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 7024336c3..fe9415b1d 100644 +index 7024336c3a..fe9415b1de 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java @@ -359,4 +359,10 @@ public class PaperWorldConfig { @@ -27,7 +27,7 @@ index 7024336c3..fe9415b1d 100644 + } } diff --git a/src/main/java/net/minecraft/server/EntityProjectile.java b/src/main/java/net/minecraft/server/EntityProjectile.java -index bb4679cf7..c19828ed5 100644 +index 5f0cb4c33d..f2f4b2d929 100644 --- a/src/main/java/net/minecraft/server/EntityProjectile.java +++ b/src/main/java/net/minecraft/server/EntityProjectile.java @@ -205,6 +205,7 @@ public abstract class EntityProjectile extends Entity implements IProjectile { diff --git a/Spigot-Server-Patches/0225-Expand-World.spawnParticle-API-and-add-Builder.patch b/Spigot-Server-Patches/0225-Expand-World.spawnParticle-API-and-add-Builder.patch index 26f9a0764d..49a4d07ede 100644 --- a/Spigot-Server-Patches/0225-Expand-World.spawnParticle-API-and-add-Builder.patch +++ b/Spigot-Server-Patches/0225-Expand-World.spawnParticle-API-and-add-Builder.patch @@ -1,4 +1,4 @@ -From 83d47677f2fc2bbe9c66a0ca32fcc5930f8559d9 Mon Sep 17 00:00:00 2001 +From 3eff29b96328fe92b82b643a8082cee3fd2915d5 Mon Sep 17 00:00:00 2001 From: Aikar Date: Tue, 15 Aug 2017 22:29:12 -0400 Subject: [PATCH] Expand World.spawnParticle API and add Builder @@ -10,7 +10,7 @@ Adds an option to control the force mode of the particle. This adds a new Builder API which is much friendlier to use. diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java -index 9fdc8f5b0..8bc0a8cca 100644 +index ebd1ff1d50..5172ff53d3 100644 --- a/src/main/java/net/minecraft/server/WorldServer.java +++ b/src/main/java/net/minecraft/server/WorldServer.java @@ -48,7 +48,7 @@ public class WorldServer extends World { @@ -43,7 +43,7 @@ index 9fdc8f5b0..8bc0a8cca 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 842c28f31..8ed22217d 100644 +index 9c68334377..84f2a966c5 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java @@ -2037,11 +2037,17 @@ public class CraftWorld implements World { diff --git a/Spigot-Server-Patches/0226-EndermanAttackPlayerEvent.patch b/Spigot-Server-Patches/0226-EndermanAttackPlayerEvent.patch index 916a282d80..171b35dc51 100644 --- a/Spigot-Server-Patches/0226-EndermanAttackPlayerEvent.patch +++ b/Spigot-Server-Patches/0226-EndermanAttackPlayerEvent.patch @@ -1,4 +1,4 @@ -From c1e8cc5b95fa04549889bee6fbf16fe1d17b79bc Mon Sep 17 00:00:00 2001 +From 25469b33d7e22e10254bd7983eaeabe40bfec8b6 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 d0fb14992..79d23f152 100644 +index d9288ad44b..6db334cb59 100644 --- a/src/main/java/net/minecraft/server/EntityEnderman.java +++ b/src/main/java/net/minecraft/server/EntityEnderman.java @@ -138,7 +138,15 @@ public class EntityEnderman extends EntityMonster { diff --git a/Spigot-Server-Patches/0227-WitchConsumePotionEvent.patch b/Spigot-Server-Patches/0227-WitchConsumePotionEvent.patch index 479a222c34..76112ae102 100644 --- a/Spigot-Server-Patches/0227-WitchConsumePotionEvent.patch +++ b/Spigot-Server-Patches/0227-WitchConsumePotionEvent.patch @@ -1,4 +1,4 @@ -From c518ab779cf71f5684249de8f862ae2553f734c7 Mon Sep 17 00:00:00 2001 +From 534717b1b3bb0be6df637f5a27188c6958c99edf 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 477b53fa7..abac47d4c 100644 +index 1d6232f4ea..8ae1a38a49 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 { diff --git a/Spigot-Server-Patches/0228-WitchThrowPotionEvent.patch b/Spigot-Server-Patches/0228-WitchThrowPotionEvent.patch index 8bca4a27c6..7543a3089d 100644 --- a/Spigot-Server-Patches/0228-WitchThrowPotionEvent.patch +++ b/Spigot-Server-Patches/0228-WitchThrowPotionEvent.patch @@ -1,4 +1,4 @@ -From 75e4318efd8c16da439f920894a45ccb7033107e Mon Sep 17 00:00:00 2001 +From e5fab2bd7f7e915e618e7865a2e9f9ff56e09962 Mon Sep 17 00:00:00 2001 From: Aikar Date: Wed, 16 May 2018 20:44:58 -0400 Subject: [PATCH] WitchThrowPotionEvent diff --git a/Spigot-Server-Patches/0229-Allow-spawning-Item-entities-with-World.spawnEntity.patch b/Spigot-Server-Patches/0229-Allow-spawning-Item-entities-with-World.spawnEntity.patch index 633a3a55f2..6728d2d7ae 100644 --- a/Spigot-Server-Patches/0229-Allow-spawning-Item-entities-with-World.spawnEntity.patch +++ b/Spigot-Server-Patches/0229-Allow-spawning-Item-entities-with-World.spawnEntity.patch @@ -1,4 +1,4 @@ -From 8548ec8d893e3f2f8a1a6e51d005542f8f8c358a Mon Sep 17 00:00:00 2001 +From f235f2e85c046f64de5b8d40648d3197d99ac481 Mon Sep 17 00:00:00 2001 From: Aikar Date: Mon, 4 Jun 2018 20:39:20 -0400 Subject: [PATCH] Allow spawning Item entities with World.spawnEntity @@ -8,7 +8,7 @@ This API has more capabilities than .dropItem with the Consumer function Item can be set inside of the Consumer pre spawn function. diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -index 8ed22217d..8fa9346cf 100644 +index 84f2a966c5..11ab222c54 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java @@ -1304,6 +1304,10 @@ public class CraftWorld implements World { diff --git a/Spigot-Server-Patches/0230-WitchReadyPotionEvent.patch b/Spigot-Server-Patches/0230-WitchReadyPotionEvent.patch index e8a5cd3596..861e17db5a 100644 --- a/Spigot-Server-Patches/0230-WitchReadyPotionEvent.patch +++ b/Spigot-Server-Patches/0230-WitchReadyPotionEvent.patch @@ -1,11 +1,11 @@ -From 65ffa74665176584d251ac883242866208de3a58 Mon Sep 17 00:00:00 2001 +From 70c86bada7bd54f41673ff7e18e0fdce73c8795c 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 b9307d380..ae9efb72c 100644 +index 59339e529b..8b95ec3a81 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 { diff --git a/Spigot-Server-Patches/0231-ItemStack-getMaxItemUseDuration.patch b/Spigot-Server-Patches/0231-ItemStack-getMaxItemUseDuration.patch index 98df85f9d2..d21b771157 100644 --- a/Spigot-Server-Patches/0231-ItemStack-getMaxItemUseDuration.patch +++ b/Spigot-Server-Patches/0231-ItemStack-getMaxItemUseDuration.patch @@ -1,4 +1,4 @@ -From 52e712c639fa1fff30acb46129f4dd26137ea23a Mon Sep 17 00:00:00 2001 +From 755f2b9c4d71b26389441de1e6c4e2cef3e1c0da 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 b7d327211..2acd02f2f 100644 +index b7d327211c..2acd02f2f4 100644 --- a/src/main/java/net/minecraft/server/ItemStack.java +++ b/src/main/java/net/minecraft/server/ItemStack.java @@ -545,6 +545,7 @@ public final class ItemStack { @@ -18,7 +18,7 @@ index b7d327211..2acd02f2f 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 88154d2f2..1609e6bbb 100644 +index 88154d2f23..1609e6bbb6 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 { diff --git a/Spigot-Server-Patches/0232-Implement-EntityTeleportEndGatewayEvent.patch b/Spigot-Server-Patches/0232-Implement-EntityTeleportEndGatewayEvent.patch index a41e245336..eae658c9b0 100644 --- a/Spigot-Server-Patches/0232-Implement-EntityTeleportEndGatewayEvent.patch +++ b/Spigot-Server-Patches/0232-Implement-EntityTeleportEndGatewayEvent.patch @@ -1,4 +1,4 @@ -From e0cce0e22959bdecaf5d296c68f783281955e71b Mon Sep 17 00:00:00 2001 +From 4e753db14aaf9e56d2ec51f2ba2485d4d4947808 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/Spigot-Server-Patches/0233-Unset-Ignited-flag-on-cancel-of-Explosion-Event.patch b/Spigot-Server-Patches/0233-Unset-Ignited-flag-on-cancel-of-Explosion-Event.patch index e7159098dd..c64a1e10af 100644 --- a/Spigot-Server-Patches/0233-Unset-Ignited-flag-on-cancel-of-Explosion-Event.patch +++ b/Spigot-Server-Patches/0233-Unset-Ignited-flag-on-cancel-of-Explosion-Event.patch @@ -1,4 +1,4 @@ -From 810df168f3f9d24649dbb668359a5155163d1b11 Mon Sep 17 00:00:00 2001 +From 8ecafc508a17ba2644d911bc870ba36fc3a05327 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 9f03d0337..29569805c 100644 +index 9f03d03375..29569805cb 100644 --- a/src/main/java/net/minecraft/server/EntityCreeper.java +++ b/src/main/java/net/minecraft/server/EntityCreeper.java @@ -11,7 +11,7 @@ public class EntityCreeper extends EntityMonster { diff --git a/Spigot-Server-Patches/0234-Fix-CraftEntity-hashCode.patch b/Spigot-Server-Patches/0234-Fix-CraftEntity-hashCode.patch index e0c4cd129b..f6dd08fbbb 100644 --- a/Spigot-Server-Patches/0234-Fix-CraftEntity-hashCode.patch +++ b/Spigot-Server-Patches/0234-Fix-CraftEntity-hashCode.patch @@ -1,4 +1,4 @@ -From 46b6981ff1b0e0f82a01d035f8957cfce5f43947 Mon Sep 17 00:00:00 2001 +From 7577c4562963830daa3950eecb055307bdbc03d3 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sun, 10 Jun 2018 20:20:15 -0400 Subject: [PATCH] Fix CraftEntity hashCode @@ -21,7 +21,7 @@ check is essentially the same as this.getHandle() == other.getHandle() However, replaced it too to make it clearer of intent. diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java -index b000bc8c7..1cd3448e5 100644 +index b000bc8c71..1cd3448e57 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java @@ -720,14 +720,15 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity { diff --git a/Spigot-Server-Patches/0235-Configurable-Alternative-LootPool-Luck-Formula.patch b/Spigot-Server-Patches/0235-Configurable-Alternative-LootPool-Luck-Formula.patch index bddc1d3bdb..ffca201b30 100644 --- a/Spigot-Server-Patches/0235-Configurable-Alternative-LootPool-Luck-Formula.patch +++ b/Spigot-Server-Patches/0235-Configurable-Alternative-LootPool-Luck-Formula.patch @@ -1,4 +1,4 @@ -From 939c154d7d138ceb717b45c9aa6d631025abd410 Mon Sep 17 00:00:00 2001 +From 7b35804a3a5438674bd8686549d8e926605e0583 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 a186b6eb0..a9b71c85d 100644 +index a186b6eb01..a9b71c85d5 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 a186b6eb0..a9b71c85d 100644 + } } diff --git a/src/main/java/net/minecraft/server/LootSelectorEntry.java b/src/main/java/net/minecraft/server/LootSelectorEntry.java -index 1016325bd..2c979e0b7 100644 +index 1016325bd7..2c979e0b74 100644 --- a/src/main/java/net/minecraft/server/LootSelectorEntry.java +++ b/src/main/java/net/minecraft/server/LootSelectorEntry.java @@ -13,8 +13,8 @@ import org.apache.commons.lang3.ArrayUtils; diff --git a/Spigot-Server-Patches/0236-Print-Error-details-when-failing-to-save-player-data.patch b/Spigot-Server-Patches/0236-Print-Error-details-when-failing-to-save-player-data.patch index 4777db8c02..c6c2b41b98 100644 --- a/Spigot-Server-Patches/0236-Print-Error-details-when-failing-to-save-player-data.patch +++ b/Spigot-Server-Patches/0236-Print-Error-details-when-failing-to-save-player-data.patch @@ -1,11 +1,11 @@ -From a97e11a7eb0ecf2d092cc3e507832bd1bdc2acc5 Mon Sep 17 00:00:00 2001 +From 59e72dcc9ccf2fcb82757c7d47ef003aef419f3c 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 e60e10c57..350ac42d6 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 { diff --git a/Spigot-Server-Patches/0237-Make-shield-blocking-delay-configurable.patch b/Spigot-Server-Patches/0237-Make-shield-blocking-delay-configurable.patch index 86a91b171a..db9c1b56dc 100644 --- a/Spigot-Server-Patches/0237-Make-shield-blocking-delay-configurable.patch +++ b/Spigot-Server-Patches/0237-Make-shield-blocking-delay-configurable.patch @@ -1,4 +1,4 @@ -From 035ee217ed1cc5f2fb1c66052041db79f8568503 Mon Sep 17 00:00:00 2001 +From 9c856cf049cf38bb7bcdefaf2a6c0ca4a4981520 Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Sat, 16 Jun 2018 01:18:16 -0500 Subject: [PATCH] Make shield blocking delay configurable @@ -19,7 +19,7 @@ index fe9415b1de..ce17447faf 100644 + } } diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java -index ea73c8968d..1bbf2fb867 100644 +index 6c75db0ee2..d4d86d854d 100644 --- a/src/main/java/net/minecraft/server/EntityLiving.java +++ b/src/main/java/net/minecraft/server/EntityLiving.java @@ -2921,7 +2921,7 @@ public abstract class EntityLiving extends Entity { diff --git a/Spigot-Server-Patches/0238-Ignore-Missing-Recipes-in-RecipeBook-to-avoid-data-e.patch b/Spigot-Server-Patches/0238-Ignore-Missing-Recipes-in-RecipeBook-to-avoid-data-e.patch index d627b03e78..2154554045 100644 --- a/Spigot-Server-Patches/0238-Ignore-Missing-Recipes-in-RecipeBook-to-avoid-data-e.patch +++ b/Spigot-Server-Patches/0238-Ignore-Missing-Recipes-in-RecipeBook-to-avoid-data-e.patch @@ -1,4 +1,4 @@ -From 453c9662414093f38b5608b9945a423e1eafa7a8 Mon Sep 17 00:00:00 2001 +From f6540b3ed8639b1923ff76884b0725d730fc0bc4 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sat, 16 Jun 2018 16:23:38 -0400 Subject: [PATCH] Ignore Missing Recipes in RecipeBook to avoid data errors @@ -6,7 +6,7 @@ Subject: [PATCH] Ignore Missing Recipes in RecipeBook to avoid data errors This code was causing NPE's in saving player data, potentially related to reloads. diff --git a/src/main/java/net/minecraft/server/RecipeBookServer.java b/src/main/java/net/minecraft/server/RecipeBookServer.java -index 440e8f134..091c4abbd 100644 +index 440e8f1342..091c4abbd1 100644 --- a/src/main/java/net/minecraft/server/RecipeBookServer.java +++ b/src/main/java/net/minecraft/server/RecipeBookServer.java @@ -78,6 +78,10 @@ public class RecipeBookServer extends RecipeBook { diff --git a/Spigot-Server-Patches/0239-EntityShootBowEvent-consumeArrow-and-getArrowItem-AP.patch b/Spigot-Server-Patches/0239-EntityShootBowEvent-consumeArrow-and-getArrowItem-AP.patch index 05bc2eb285..d8ebc46de2 100644 --- a/Spigot-Server-Patches/0239-EntityShootBowEvent-consumeArrow-and-getArrowItem-AP.patch +++ b/Spigot-Server-Patches/0239-EntityShootBowEvent-consumeArrow-and-getArrowItem-AP.patch @@ -1,4 +1,4 @@ -From 7c485268911d96a10af630157b83d208318c108b Mon Sep 17 00:00:00 2001 +From ecc5bdcebaa279b9ab3ae95ae802ae03b095e568 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 @@ -59,7 +59,7 @@ index 50b815dc89..4ec02c8ce7 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 670b0b33ae..5d58d5e356 100644 +index 1e75e3002a..1e17522154 100644 --- a/src/main/java/net/minecraft/server/ItemCrossbow.java +++ b/src/main/java/net/minecraft/server/ItemCrossbow.java @@ -220,7 +220,7 @@ public class ItemCrossbow extends ItemProjectileWeapon { diff --git a/Spigot-Server-Patches/0240-PlayerReadyArrowEvent.patch b/Spigot-Server-Patches/0240-PlayerReadyArrowEvent.patch index 08b9c10681..59490bb633 100644 --- a/Spigot-Server-Patches/0240-PlayerReadyArrowEvent.patch +++ b/Spigot-Server-Patches/0240-PlayerReadyArrowEvent.patch @@ -1,4 +1,4 @@ -From d10e979d970594ed8c9d2539326598cf62d74f32 Mon Sep 17 00:00:00 2001 +From 25e97f56beac3ed08e50cc44c43931e6e7fedfad 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 9abdf8b24..fc25b3c74 100644 +index 9abdf8b24b..fc25b3c749 100644 --- a/src/main/java/net/minecraft/server/EntityHuman.java +++ b/src/main/java/net/minecraft/server/EntityHuman.java @@ -2033,6 +2033,17 @@ public abstract class EntityHuman extends EntityLiving { diff --git a/Spigot-Server-Patches/0241-Fire-EntityShootBowEvent-for-Illusioner.patch b/Spigot-Server-Patches/0241-Fire-EntityShootBowEvent-for-Illusioner.patch index b84ef37300..e237d270f0 100644 --- a/Spigot-Server-Patches/0241-Fire-EntityShootBowEvent-for-Illusioner.patch +++ b/Spigot-Server-Patches/0241-Fire-EntityShootBowEvent-for-Illusioner.patch @@ -1,11 +1,11 @@ -From c128a3620a1bc6a88369bee577338c70c39b5377 Mon Sep 17 00:00:00 2001 +From 13647e3000835a128c421dd2c33af04b0203a8aa 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 378267314..96ad67889 100644 +index 4e0e6caa16..76641682b1 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 diff --git a/Spigot-Server-Patches/0242-Implement-EntityKnockbackByEntityEvent.patch b/Spigot-Server-Patches/0242-Implement-EntityKnockbackByEntityEvent.patch index 163a9ddc2a..272f01c16f 100644 --- a/Spigot-Server-Patches/0242-Implement-EntityKnockbackByEntityEvent.patch +++ b/Spigot-Server-Patches/0242-Implement-EntityKnockbackByEntityEvent.patch @@ -1,4 +1,4 @@ -From 1380b7e1b161644e790fc4018175d323c025262a Mon Sep 17 00:00:00 2001 +From 765f3348afbcbcd533aae466387acc76729fadce 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 1bbf2fb867..14305ecbb3 100644 +index d4d86d854d..90099c814a 100644 --- a/src/main/java/net/minecraft/server/EntityLiving.java +++ b/src/main/java/net/minecraft/server/EntityLiving.java @@ -1430,6 +1430,16 @@ public abstract class EntityLiving extends Entity { diff --git a/Spigot-Server-Patches/0243-Expand-Explosions-API.patch b/Spigot-Server-Patches/0243-Expand-Explosions-API.patch index 73ec9e98ac..a6ce5428a7 100644 --- a/Spigot-Server-Patches/0243-Expand-Explosions-API.patch +++ b/Spigot-Server-Patches/0243-Expand-Explosions-API.patch @@ -1,4 +1,4 @@ -From 8ff5fe014acc20e4991e9d007dc6cb2fa2d34a2d Mon Sep 17 00:00:00 2001 +From 9ee55f3977257bd7e704ee490a817026f4ec17e0 Mon Sep 17 00:00:00 2001 From: Aikar Date: Wed, 20 Jun 2018 23:17:24 -0400 Subject: [PATCH] Expand Explosions API @@ -6,7 +6,7 @@ Subject: [PATCH] Expand Explosions API Add Entity as a Source capability, and add more API choices, and on Location. diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -index 8fa9346cf..83a8f083a 100644 +index 11ab222c54..10c91699c1 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java @@ -753,6 +753,11 @@ public class CraftWorld implements World { diff --git a/Spigot-Server-Patches/0244-LivingEntity-Hand-Raised-Item-Use-API.patch b/Spigot-Server-Patches/0244-LivingEntity-Hand-Raised-Item-Use-API.patch index ce519b2165..057448797e 100644 --- a/Spigot-Server-Patches/0244-LivingEntity-Hand-Raised-Item-Use-API.patch +++ b/Spigot-Server-Patches/0244-LivingEntity-Hand-Raised-Item-Use-API.patch @@ -1,4 +1,4 @@ -From 43e05d8060ea790b1bdd8ae1646bb9a3c6d8befe Mon Sep 17 00:00:00 2001 +From 39d561898eece86f85417ca6cadea77ed5014724 Mon Sep 17 00:00:00 2001 From: Aikar Date: Fri, 29 Jun 2018 00:21:28 -0400 Subject: [PATCH] LivingEntity Hand Raised/Item Use API @@ -6,7 +6,7 @@ Subject: [PATCH] LivingEntity Hand Raised/Item Use API How long an entity has raised hands to charge an attack or use an item diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java -index 14305ecbb3..38ca6d6ba5 100644 +index 90099c814a..d2dddf1c72 100644 --- a/src/main/java/net/minecraft/server/EntityLiving.java +++ b/src/main/java/net/minecraft/server/EntityLiving.java @@ -109,7 +109,7 @@ public abstract class EntityLiving extends Entity { diff --git a/Spigot-Server-Patches/0245-RangedEntity-API.patch b/Spigot-Server-Patches/0245-RangedEntity-API.patch index eb4daaf453..32fe175055 100644 --- a/Spigot-Server-Patches/0245-RangedEntity-API.patch +++ b/Spigot-Server-Patches/0245-RangedEntity-API.patch @@ -1,4 +1,4 @@ -From c2649f2a1cb5d9cf649e2b903088b67974cc1437 Mon Sep 17 00:00:00 2001 +From b97bdeb770cff25de08365bcc4e69092340a1407 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 000000000..696660b08 +index 0000000000..696660b089 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/entity/CraftRangedEntity.java @@ -0,0 +1,19 @@ @@ -32,7 +32,7 @@ index 000000000..696660b08 + } +} diff --git a/src/main/java/net/minecraft/server/IRangedEntity.java b/src/main/java/net/minecraft/server/IRangedEntity.java -index b4178ce1e..9b79ac77d 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 b4178ce1e..9b79ac77d 100644 + void q(boolean flag); default void setChargingAttack(boolean charging) { q(charging); }; // Paper } diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftIllusioner.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftIllusioner.java -index 2ec1af8be..f31d3eed3 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 @@ @@ -64,7 +64,7 @@ index 2ec1af8be..f31d3eed3 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 23ab78da1..3f94c5a92 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 @@ @@ -84,7 +84,7 @@ index 23ab78da1..3f94c5a92 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 b4ae89840..02df66ecf 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 @@ @@ -102,7 +102,7 @@ index b4ae89840..02df66ecf 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 27460c59e..e482b1c9d 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 @@ @@ -120,7 +120,7 @@ index 27460c59e..e482b1c9d 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 244e4dc8e..bae107e76 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 @@ @@ -138,7 +138,7 @@ index 244e4dc8e..bae107e76 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 38b555cc7..03cf6136e 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 @@ diff --git a/Spigot-Server-Patches/0246-Add-config-to-disable-ender-dragon-legacy-check.patch b/Spigot-Server-Patches/0246-Add-config-to-disable-ender-dragon-legacy-check.patch index d97c7213e7..f21604e52c 100644 --- a/Spigot-Server-Patches/0246-Add-config-to-disable-ender-dragon-legacy-check.patch +++ b/Spigot-Server-Patches/0246-Add-config-to-disable-ender-dragon-legacy-check.patch @@ -1,11 +1,11 @@ -From 0365c9c7e44ea4326f46d4cf77d2fe11f9586010 Mon Sep 17 00:00:00 2001 +From 30bc95e9ec59925c14131742d7e0b9b2ef7052a3 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 ce17447fa..3294fbbea 100644 +index ce17447faf..3294fbbeaf 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java @@ -370,4 +370,9 @@ public class PaperWorldConfig { @@ -19,7 +19,7 @@ index ce17447fa..3294fbbea 100644 + } } diff --git a/src/main/java/net/minecraft/server/EnderDragonBattle.java b/src/main/java/net/minecraft/server/EnderDragonBattle.java -index 6f92820c3..c9d271145 100644 +index 88a8e4abd0..6700c8c658 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 { diff --git a/Spigot-Server-Patches/0247-Implement-World.getEntity-UUID-API.patch b/Spigot-Server-Patches/0247-Implement-World.getEntity-UUID-API.patch index 05e3ebc14f..9859dd06e0 100644 --- a/Spigot-Server-Patches/0247-Implement-World.getEntity-UUID-API.patch +++ b/Spigot-Server-Patches/0247-Implement-World.getEntity-UUID-API.patch @@ -1,11 +1,11 @@ -From 4d9a417496995c21613e5e027553b0354bf120a5 Mon Sep 17 00:00:00 2001 +From 2836ae3e527f34338cdfeabdafb8c4ac96b86a21 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 83a8f083a..4c67f071b 100644 +index 10c91699c1..09e6abdae2 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java @@ -1107,6 +1107,15 @@ public class CraftWorld implements World { diff --git a/Spigot-Server-Patches/0248-InventoryCloseEvent-Reason-API.patch b/Spigot-Server-Patches/0248-InventoryCloseEvent-Reason-API.patch index a645170377..d5da6047bc 100644 --- a/Spigot-Server-Patches/0248-InventoryCloseEvent-Reason-API.patch +++ b/Spigot-Server-Patches/0248-InventoryCloseEvent-Reason-API.patch @@ -1,4 +1,4 @@ -From 8a27d148e5b13149a4fd0dc3779f8e02d01fedab Mon Sep 17 00:00:00 2001 +From 198b948f38ebe4bae971c1d5ec0778989a922fd9 Mon Sep 17 00:00:00 2001 From: Aikar Date: Tue, 3 Jul 2018 21:56:23 -0400 Subject: [PATCH] InventoryCloseEvent Reason API @@ -7,7 +7,7 @@ Allows you to determine why an inventory was closed, enabling plugin developers to "confirm" things based on if it was player triggered close or not. diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java -index 98023adfca..a00b9b2091 100644 +index fc25b3c749..e316e2af7d 100644 --- a/src/main/java/net/minecraft/server/EntityHuman.java +++ b/src/main/java/net/minecraft/server/EntityHuman.java @@ -149,7 +149,7 @@ public abstract class EntityHuman extends EntityLiving { diff --git a/Spigot-Server-Patches/0249-Configurable-Bed-Search-Radius.patch b/Spigot-Server-Patches/0249-Configurable-Bed-Search-Radius.patch index ee99b33f3f..e016d07318 100644 --- a/Spigot-Server-Patches/0249-Configurable-Bed-Search-Radius.patch +++ b/Spigot-Server-Patches/0249-Configurable-Bed-Search-Radius.patch @@ -1,4 +1,4 @@ -From d3c304ba037b964dd8e7d7c60aceccf5cd941a7c Mon Sep 17 00:00:00 2001 +From 404861b0acd6edf6d049fb1d986be5197ab2f13d 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 3294fbbea..83e54cb90 100644 +index 3294fbbeaf..83e54cb904 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java @@ -375,4 +375,15 @@ public class PaperWorldConfig { @@ -30,7 +30,7 @@ index 3294fbbea..83e54cb90 100644 + } } diff --git a/src/main/java/net/minecraft/server/BlockBed.java b/src/main/java/net/minecraft/server/BlockBed.java -index 3ef19c0c2..07e530666 100644 +index c49eb0ecb3..034226d0b3 100644 --- a/src/main/java/net/minecraft/server/BlockBed.java +++ b/src/main/java/net/minecraft/server/BlockBed.java @@ -171,6 +171,58 @@ public class BlockBed extends BlockFacingHorizontal implements ITileEntity { diff --git a/Spigot-Server-Patches/0250-Vex-getSummoner-API.patch b/Spigot-Server-Patches/0250-Vex-getSummoner-API.patch index 5f6b6804f3..539805a70e 100644 --- a/Spigot-Server-Patches/0250-Vex-getSummoner-API.patch +++ b/Spigot-Server-Patches/0250-Vex-getSummoner-API.patch @@ -1,4 +1,4 @@ -From aca49231eae17fd7b76f6e694dfd77a9a17a9cdb Mon Sep 17 00:00:00 2001 +From 024da92de8dda77f834fab9e8bbf8a2e616dac90 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 ecfc057a1..83e022c91 100644 +index e74f85e6f0..d7bea83890 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 ecfc057a1..83e022c91 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 737a37b6f..169c951ec 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 @@ diff --git a/Spigot-Server-Patches/0251-Refresh-player-inventory-when-cancelling-PlayerInter.patch b/Spigot-Server-Patches/0251-Refresh-player-inventory-when-cancelling-PlayerInter.patch index 0008623dc5..82f068a5af 100644 --- a/Spigot-Server-Patches/0251-Refresh-player-inventory-when-cancelling-PlayerInter.patch +++ b/Spigot-Server-Patches/0251-Refresh-player-inventory-when-cancelling-PlayerInter.patch @@ -1,4 +1,4 @@ -From c44aa8d4fc35fbc4d791635d1701fb31cf93ae03 Mon Sep 17 00:00:00 2001 +From 18e72830a744e8103e3766288bee7662ca78c746 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 diff --git a/Spigot-Server-Patches/0252-Don-t-change-the-Entity-Random-seed-for-squids.patch b/Spigot-Server-Patches/0252-Don-t-change-the-Entity-Random-seed-for-squids.patch index c5d6a160c2..721e461d8d 100644 --- a/Spigot-Server-Patches/0252-Don-t-change-the-Entity-Random-seed-for-squids.patch +++ b/Spigot-Server-Patches/0252-Don-t-change-the-Entity-Random-seed-for-squids.patch @@ -1,11 +1,11 @@ -From 5b0db2592123e745f32863009745fc7171e7d6d7 Mon Sep 17 00:00:00 2001 +From efd38f5c81cb787455dd6765999ce322b0a5f1fb 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 d5dff4b88..77c0ed42f 100644 +index d5dff4b88c..77c0ed42f4 100644 --- a/src/main/java/net/minecraft/server/EntitySquid.java +++ b/src/main/java/net/minecraft/server/EntitySquid.java @@ -19,7 +19,7 @@ public class EntitySquid extends EntityWaterAnimal { diff --git a/Spigot-Server-Patches/0253-Re-add-vanilla-entity-warnings-for-duplicates.patch b/Spigot-Server-Patches/0253-Re-add-vanilla-entity-warnings-for-duplicates.patch index 14f7ffacf7..351058947e 100644 --- a/Spigot-Server-Patches/0253-Re-add-vanilla-entity-warnings-for-duplicates.patch +++ b/Spigot-Server-Patches/0253-Re-add-vanilla-entity-warnings-for-duplicates.patch @@ -1,4 +1,4 @@ -From a84f053e31b506b807cfbaa53efceccbe638e435 Mon Sep 17 00:00:00 2001 +From af71e8f923576c61e1fd1b70fa6da337937311e9 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 067379252..bac458fa5 100644 +index 139168291a..8cffbabfb6 100644 --- a/src/main/java/net/minecraft/server/WorldServer.java +++ b/src/main/java/net/minecraft/server/WorldServer.java @@ -966,7 +966,8 @@ public class WorldServer extends World { diff --git a/Spigot-Server-Patches/0254-Avoid-item-merge-if-stack-size-above-max-stack-size.patch b/Spigot-Server-Patches/0254-Avoid-item-merge-if-stack-size-above-max-stack-size.patch index af22dfef58..ae4f14c1af 100644 --- a/Spigot-Server-Patches/0254-Avoid-item-merge-if-stack-size-above-max-stack-size.patch +++ b/Spigot-Server-Patches/0254-Avoid-item-merge-if-stack-size-above-max-stack-size.patch @@ -1,11 +1,11 @@ -From 4ec3c92456d00800b0fc1434d78792ea0666c62a Mon Sep 17 00:00:00 2001 +From 033842e4800d90638db98df5f5d86cbca8afc7b4 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 bda5ea463..ddd1f6307 100644 +index bda5ea4632..ddd1f63073 100644 --- a/src/main/java/net/minecraft/server/EntityItem.java +++ b/src/main/java/net/minecraft/server/EntityItem.java @@ -168,6 +168,10 @@ public class EntityItem extends Entity { diff --git a/Spigot-Server-Patches/0255-Use-asynchronous-Log4j-2-loggers.patch b/Spigot-Server-Patches/0255-Use-asynchronous-Log4j-2-loggers.patch index 35ce8109c7..b24b902fbc 100644 --- a/Spigot-Server-Patches/0255-Use-asynchronous-Log4j-2-loggers.patch +++ b/Spigot-Server-Patches/0255-Use-asynchronous-Log4j-2-loggers.patch @@ -1,11 +1,11 @@ -From 5688621e649d0231db63467f9ff9cdadc2435428 Mon Sep 17 00:00:00 2001 +From bd87b77fd11900ab14d6da9f95aab5bd47268477 Mon Sep 17 00:00:00 2001 From: Minecrell Date: Tue, 17 Jul 2018 16:42:17 +0200 Subject: [PATCH] Use asynchronous Log4j 2 loggers diff --git a/pom.xml b/pom.xml -index 3d2065fd7..e01d95f17 100644 +index a10ab7cbb6..2cb84223e6 100644 --- a/pom.xml +++ b/pom.xml @@ -74,6 +74,13 @@ @@ -24,7 +24,7 @@ index 3d2065fd7..e01d95f17 100644 asm diff --git a/src/main/resources/log4j2.component.properties b/src/main/resources/log4j2.component.properties new file mode 100644 -index 000000000..ee7c90784 +index 0000000000..ee7c90784c --- /dev/null +++ b/src/main/resources/log4j2.component.properties @@ -0,0 +1 @@ diff --git a/Spigot-Server-Patches/0256-add-more-information-to-Entity.toString.patch b/Spigot-Server-Patches/0256-add-more-information-to-Entity.toString.patch index fc7a500259..c4f4263e22 100644 --- a/Spigot-Server-Patches/0256-add-more-information-to-Entity.toString.patch +++ b/Spigot-Server-Patches/0256-add-more-information-to-Entity.toString.patch @@ -1,4 +1,4 @@ -From 758511ff8ae95de6652894487450399dfaed7dfe Mon Sep 17 00:00:00 2001 +From 97396508ccc63f9cee4ae1a57457cdb69a1b36e3 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 d5d86d0f1..4701cc46e 100644 +index 0915dede9a..ddfa88bac5 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java @@ -2442,7 +2442,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke diff --git a/Spigot-Server-Patches/0257-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch b/Spigot-Server-Patches/0257-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch index bf136de23b..e7ac76f20d 100644 --- a/Spigot-Server-Patches/0257-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch +++ b/Spigot-Server-Patches/0257-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch @@ -1,4 +1,4 @@ -From 34f06af441370b08d6c7f513573984728a0f84fc Mon Sep 17 00:00:00 2001 +From b06c48f69f98f42c9daa47871ab113c74a771f88 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 diff --git a/Spigot-Server-Patches/0258-EnderDragon-Events.patch b/Spigot-Server-Patches/0258-EnderDragon-Events.patch index 498c998eec..3a824171c1 100644 --- a/Spigot-Server-Patches/0258-EnderDragon-Events.patch +++ b/Spigot-Server-Patches/0258-EnderDragon-Events.patch @@ -1,11 +1,11 @@ -From dffbb87fbab5fa0d05c2dd60d7e56c6d36045ca9 Mon Sep 17 00:00:00 2001 +From e5fd77b064727ca215a4a1bd6692c44cf7c55aa1 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 4ab310cd6..90f6d58dd 100644 +index 4ab310cd6b..90f6d58ddd 100644 --- a/src/main/java/net/minecraft/server/DragonControllerLandedFlame.java +++ b/src/main/java/net/minecraft/server/DragonControllerLandedFlame.java @@ -65,7 +65,9 @@ public class DragonControllerLandedFlame extends AbstractDragonControllerLanded @@ -28,7 +28,7 @@ index 4ab310cd6..90f6d58dd 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 b46660576..bf15964e7 100644 +index 14e20f4961..0b0815e113 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 { @@ -42,7 +42,7 @@ index b46660576..bf15964e7 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 239be99c5..2195b83ce 100644 +index 239be99c51..2195b83ce2 100644 --- a/src/main/java/net/minecraft/server/EntityDragonFireball.java +++ b/src/main/java/net/minecraft/server/EntityDragonFireball.java @@ -40,8 +40,10 @@ public class EntityDragonFireball extends EntityFireball { diff --git a/Spigot-Server-Patches/0259-PlayerElytraBoostEvent.patch b/Spigot-Server-Patches/0259-PlayerElytraBoostEvent.patch index f1eee276e8..c9ef9c572f 100644 --- a/Spigot-Server-Patches/0259-PlayerElytraBoostEvent.patch +++ b/Spigot-Server-Patches/0259-PlayerElytraBoostEvent.patch @@ -1,11 +1,11 @@ -From 5c9b1b12639ffaf18d5c904ca9c101195b9c955d Mon Sep 17 00:00:00 2001 +From 2ca9b69f16fed32a11b667af444ce8ec02ba7b4f 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 aea46ffae..9e86ef4ce 100644 +index aea46ffae5..9e86ef4ce2 100644 --- a/src/main/java/net/minecraft/server/ItemFireworks.java +++ b/src/main/java/net/minecraft/server/ItemFireworks.java @@ -35,11 +35,16 @@ public class ItemFireworks extends Item { diff --git a/Spigot-Server-Patches/0260-PlayerLaunchProjectileEvent.patch b/Spigot-Server-Patches/0260-PlayerLaunchProjectileEvent.patch index 9008d4968a..3b5aa01e4d 100644 --- a/Spigot-Server-Patches/0260-PlayerLaunchProjectileEvent.patch +++ b/Spigot-Server-Patches/0260-PlayerLaunchProjectileEvent.patch @@ -1,11 +1,11 @@ -From c974fc5c3fb82c035b04931c06d610ae425a3770 Mon Sep 17 00:00:00 2001 +From ff0114ea085f5753da939120866d8a07d463e9ff 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/ItemEgg.java b/src/main/java/net/minecraft/server/ItemEgg.java -index 2bdb65bf8..f526af45f 100644 +index 2bdb65bf87..f526af45fb 100644 --- a/src/main/java/net/minecraft/server/ItemEgg.java +++ b/src/main/java/net/minecraft/server/ItemEgg.java @@ -10,17 +10,35 @@ public class ItemEgg extends Item { @@ -46,7 +46,7 @@ index 2bdb65bf8..f526af45f 100644 entityhuman.b(StatisticList.ITEM_USED.b(this)); diff --git a/src/main/java/net/minecraft/server/ItemEnderPearl.java b/src/main/java/net/minecraft/server/ItemEnderPearl.java -index eb5f62dec..e8e52d726 100644 +index eb5f62dec2..e8e52d726e 100644 --- a/src/main/java/net/minecraft/server/ItemEnderPearl.java +++ b/src/main/java/net/minecraft/server/ItemEnderPearl.java @@ -16,7 +16,19 @@ public class ItemEnderPearl extends Item { @@ -94,7 +94,7 @@ index eb5f62dec..e8e52d726 100644 entityhuman.b(StatisticList.ITEM_USED.b(this)); return new InteractionResultWrapper<>(EnumInteractionResult.SUCCESS, itemstack); diff --git a/src/main/java/net/minecraft/server/ItemExpBottle.java b/src/main/java/net/minecraft/server/ItemExpBottle.java -index 35f842ede..eb626a6f0 100644 +index 35f842ede5..eb626a6f05 100644 --- a/src/main/java/net/minecraft/server/ItemExpBottle.java +++ b/src/main/java/net/minecraft/server/ItemExpBottle.java @@ -9,18 +9,35 @@ public class ItemExpBottle extends Item { @@ -136,7 +136,7 @@ index 35f842ede..eb626a6f0 100644 entityhuman.b(StatisticList.ITEM_USED.b(this)); diff --git a/src/main/java/net/minecraft/server/ItemLingeringPotion.java b/src/main/java/net/minecraft/server/ItemLingeringPotion.java -index e3683bdae..f3ad1cd6d 100644 +index e3683bdaef..f3ad1cd6d3 100644 --- a/src/main/java/net/minecraft/server/ItemLingeringPotion.java +++ b/src/main/java/net/minecraft/server/ItemLingeringPotion.java @@ -9,15 +9,40 @@ public class ItemLingeringPotion extends ItemPotion { @@ -182,7 +182,7 @@ index e3683bdae..f3ad1cd6d 100644 entityhuman.b(StatisticList.ITEM_USED.b(this)); diff --git a/src/main/java/net/minecraft/server/ItemSnowball.java b/src/main/java/net/minecraft/server/ItemSnowball.java -index 624989dd7..c119785b7 100644 +index 624989dd7b..c119785b78 100644 --- a/src/main/java/net/minecraft/server/ItemSnowball.java +++ b/src/main/java/net/minecraft/server/ItemSnowball.java @@ -23,15 +23,23 @@ public class ItemSnowball extends Item { @@ -215,7 +215,7 @@ index 624989dd7..c119785b7 100644 // CraftBukkit end diff --git a/src/main/java/net/minecraft/server/ItemSplashPotion.java b/src/main/java/net/minecraft/server/ItemSplashPotion.java -index e267e43fe..fa6d627db 100644 +index e267e43fe5..fa6d627db4 100644 --- a/src/main/java/net/minecraft/server/ItemSplashPotion.java +++ b/src/main/java/net/minecraft/server/ItemSplashPotion.java @@ -9,15 +9,39 @@ public class ItemSplashPotion extends ItemPotion { diff --git a/Spigot-Server-Patches/0261-Speedup-BlockPos-by-fixing-inlining.patch b/Spigot-Server-Patches/0261-Speedup-BlockPos-by-fixing-inlining.patch index b18e931a08..4c19f80f0c 100644 --- a/Spigot-Server-Patches/0261-Speedup-BlockPos-by-fixing-inlining.patch +++ b/Spigot-Server-Patches/0261-Speedup-BlockPos-by-fixing-inlining.patch @@ -1,4 +1,4 @@ -From e88db1b4370e9f8c046e3c8f72329be516a7728e Mon Sep 17 00:00:00 2001 +From cf330a0ba37e10d1e0d29474c603a299553f5196 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 7cb46d7a9..e96428bb2 100644 +index 7cb46d7a9c..e96428bb2b 100644 --- a/src/main/java/net/minecraft/server/BaseBlockPosition.java +++ b/src/main/java/net/minecraft/server/BaseBlockPosition.java @@ -7,22 +7,22 @@ import javax.annotation.concurrent.Immutable; @@ -101,7 +101,7 @@ index 7cb46d7a9..e96428bb2 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 64700b97c..a5e5a4eba 100644 +index edd60a3d7f..93c3fa78f6 100644 --- a/src/main/java/net/minecraft/server/BlockPosition.java +++ b/src/main/java/net/minecraft/server/BlockPosition.java @@ -335,11 +335,12 @@ public class BlockPosition extends BaseBlockPosition implements MinecraftSeriali diff --git a/Spigot-Server-Patches/0262-Optimize-RegistryID.c.patch b/Spigot-Server-Patches/0262-Optimize-RegistryID.c.patch index 43a6f98b27..163307c384 100644 --- a/Spigot-Server-Patches/0262-Optimize-RegistryID.c.patch +++ b/Spigot-Server-Patches/0262-Optimize-RegistryID.c.patch @@ -1,4 +1,4 @@ -From b23159e3fa9188ca186874d1ae2cabe634d0afc6 Mon Sep 17 00:00:00 2001 +From 1e1f295f288d1909c7a9d4092611fbe35aeba008 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 e15d28671..e8a48b9a4 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 { diff --git a/Spigot-Server-Patches/0263-Option-to-prevent-armor-stands-from-doing-entity-loo.patch b/Spigot-Server-Patches/0263-Option-to-prevent-armor-stands-from-doing-entity-loo.patch index 308c741f40..3997c547ba 100644 --- a/Spigot-Server-Patches/0263-Option-to-prevent-armor-stands-from-doing-entity-loo.patch +++ b/Spigot-Server-Patches/0263-Option-to-prevent-armor-stands-from-doing-entity-loo.patch @@ -1,11 +1,11 @@ -From 66c6d3bb58b2f815702c40910b739e16abea61b3 Mon Sep 17 00:00:00 2001 +From ce83efc44b6f9f0820ef8e9a8e1729079b07815e 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 83e54cb90..f06bb3ae1 100644 +index 83e54cb904..f06bb3ae19 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java @@ -326,6 +326,11 @@ public class PaperWorldConfig { @@ -21,7 +21,7 @@ index 83e54cb90..f06bb3ae1 100644 private void maxEntityCollision() { maxCollisionsPerEntity = getInt( "max-entity-collisions", this.spigotConfig.getInt("max-entity-collisions", 8) ); diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index 5cf3aea4f..dbb4eb0a8 100644 +index 5cf3aea4fc..dbb4eb0a88 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -877,6 +877,14 @@ public abstract class World implements IIBlockAccess, GeneratorAccess, AutoClose diff --git a/Spigot-Server-Patches/0264-Vanished-players-don-t-have-rights.patch b/Spigot-Server-Patches/0264-Vanished-players-don-t-have-rights.patch index d7b4b9f312..adcb15c95f 100644 --- a/Spigot-Server-Patches/0264-Vanished-players-don-t-have-rights.patch +++ b/Spigot-Server-Patches/0264-Vanished-players-don-t-have-rights.patch @@ -1,11 +1,11 @@ -From d59b99142a6d7e1f721e59f1fd59187de89c8b81 Mon Sep 17 00:00:00 2001 +From 4491c2b4a8ab52eec5e41af39b84552afbc83aee 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 15315a43e..7927b69ae 100644 +index 291a8029ed..fe9881fdf2 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java @@ -97,7 +97,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke @@ -18,7 +18,7 @@ index 15315a43e..7927b69ae 100644 protected int j; private Entity vehicle; diff --git a/src/main/java/net/minecraft/server/IEntityAccess.java b/src/main/java/net/minecraft/server/IEntityAccess.java -index ee22bb038..e5a013ffd 100644 +index ee22bb0387..e5a013ffd2 100644 --- a/src/main/java/net/minecraft/server/IEntityAccess.java +++ b/src/main/java/net/minecraft/server/IEntityAccess.java @@ -22,9 +22,18 @@ public interface IEntityAccess { @@ -41,7 +41,7 @@ index ee22bb038..e5a013ffd 100644 return VoxelShapes.c(voxelshape, VoxelShapes.a(entity1.getBoundingBox()), OperatorBoolean.AND); }); diff --git a/src/main/java/net/minecraft/server/IWorldReader.java b/src/main/java/net/minecraft/server/IWorldReader.java -index 7308c0c31..ed3f793f2 100644 +index 7308c0c319..ed3f793f20 100644 --- a/src/main/java/net/minecraft/server/IWorldReader.java +++ b/src/main/java/net/minecraft/server/IWorldReader.java @@ -84,7 +84,12 @@ public interface IWorldReader extends IIBlockAccess { @@ -58,7 +58,7 @@ index 7308c0c31..ed3f793f2 100644 return voxelshape.isEmpty() || this.a((Entity) null, voxelshape.a((double) blockposition.getX(), (double) blockposition.getY(), (double) blockposition.getZ())); diff --git a/src/main/java/net/minecraft/server/ItemBlock.java b/src/main/java/net/minecraft/server/ItemBlock.java -index 59b1e6ce2..b90cc6652 100644 +index 59b1e6ce2e..b90cc6652b 100644 --- a/src/main/java/net/minecraft/server/ItemBlock.java +++ b/src/main/java/net/minecraft/server/ItemBlock.java @@ -126,7 +126,8 @@ public class ItemBlock extends Item { @@ -72,7 +72,7 @@ index 59b1e6ce2..b90cc6652 100644 BlockCanBuildEvent event = new BlockCanBuildEvent(CraftBlock.at(blockactioncontext.getWorld(), blockactioncontext.getClickPosition()), player, CraftBlockData.fromData(iblockdata), defaultReturn); diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -index 309cbd0dc..78baaf625 100644 +index 309cbd0dc6..78baaf6253 100644 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java @@ -1136,6 +1136,14 @@ public class CraftEventFactory { diff --git a/Spigot-Server-Patches/0265-Mark-chunk-dirty-anytime-entities-change-to-guarante.patch b/Spigot-Server-Patches/0265-Mark-chunk-dirty-anytime-entities-change-to-guarante.patch index ed8e8b84ec..74ba0dec89 100644 --- a/Spigot-Server-Patches/0265-Mark-chunk-dirty-anytime-entities-change-to-guarante.patch +++ b/Spigot-Server-Patches/0265-Mark-chunk-dirty-anytime-entities-change-to-guarante.patch @@ -1,4 +1,4 @@ -From 8eb04eaaa71a87f84ab918a1cb3bdda831e01c6f Mon Sep 17 00:00:00 2001 +From 0e0c844c20c72cb9f2d5aede0802b5d6a576b547 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 98c2de550..4409a6ec8 100644 +index 98c2de5507..4409a6ec84 100644 --- a/src/main/java/net/minecraft/server/Chunk.java +++ b/src/main/java/net/minecraft/server/Chunk.java @@ -416,6 +416,7 @@ public class Chunk implements IChunkAccess { diff --git a/Spigot-Server-Patches/0266-Add-some-Debug-to-Chunk-Entity-slices.patch b/Spigot-Server-Patches/0266-Add-some-Debug-to-Chunk-Entity-slices.patch index bfb1507c79..0006ed83f2 100644 --- a/Spigot-Server-Patches/0266-Add-some-Debug-to-Chunk-Entity-slices.patch +++ b/Spigot-Server-Patches/0266-Add-some-Debug-to-Chunk-Entity-slices.patch @@ -1,4 +1,4 @@ -From 9c5c011680364f77ecf616fb62a3f2308e557656 Mon Sep 17 00:00:00 2001 +From d6b144589a0f3dcfeab0a749fd483581082b4c70 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 4409a6ec8..5d1947f82 100644 +index 4409a6ec84..5d1947f826 100644 --- a/src/main/java/net/minecraft/server/Chunk.java +++ b/src/main/java/net/minecraft/server/Chunk.java @@ -408,6 +408,25 @@ public class Chunk implements IChunkAccess { @@ -57,7 +57,7 @@ index 4409a6ec8..5d1947f82 100644 return; } diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java -index 7927b69ae..ba40c2be6 100644 +index fe9881fdf2..32162003ab 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java @@ -67,6 +67,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke diff --git a/Spigot-Server-Patches/0267-EntityTransformedEvent.patch b/Spigot-Server-Patches/0267-EntityTransformedEvent.patch index a97b89a045..63c4f411b8 100644 --- a/Spigot-Server-Patches/0267-EntityTransformedEvent.patch +++ b/Spigot-Server-Patches/0267-EntityTransformedEvent.patch @@ -1,11 +1,11 @@ -From d37ef40bb457ef9f6e47f4410a750f0c62addb95 Mon Sep 17 00:00:00 2001 +From ee4d164b67f8e15c3fc138d054fa387a6f36aee1 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 bb3493c14..de787d861 100644 +index bb3493c14f..de787d8614 100644 --- a/src/main/java/net/minecraft/server/EntityMushroomCow.java +++ b/src/main/java/net/minecraft/server/EntityMushroomCow.java @@ -101,6 +101,7 @@ public class EntityMushroomCow extends EntityCow { @@ -17,7 +17,7 @@ index bb3493c14..de787d861 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 b25f3d159..fe9efa9da 100644 +index b25f3d1592..fe9efa9da1 100644 --- a/src/main/java/net/minecraft/server/EntityVillager.java +++ b/src/main/java/net/minecraft/server/EntityVillager.java @@ -602,6 +602,7 @@ public class EntityVillager extends EntityVillagerAbstract implements Reputation @@ -29,7 +29,7 @@ index b25f3d159..fe9efa9da 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 4cb305ff2..171c1ae4a 100644 +index 4cb305ff28..171c1ae4ad 100644 --- a/src/main/java/net/minecraft/server/EntityZombie.java +++ b/src/main/java/net/minecraft/server/EntityZombie.java @@ -247,6 +247,7 @@ public class EntityZombie extends EntityMonster { @@ -49,7 +49,7 @@ index 4cb305ff2..171c1ae4a 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 2fe7fb788..5cfda3160 100644 +index 2fe7fb7889..5cfda3160b 100644 --- a/src/main/java/net/minecraft/server/EntityZombieVillager.java +++ b/src/main/java/net/minecraft/server/EntityZombieVillager.java @@ -157,6 +157,7 @@ public class EntityZombieVillager extends EntityZombie implements VillagerDataHo diff --git a/Spigot-Server-Patches/0268-SkeletonHorse-Additions.patch b/Spigot-Server-Patches/0268-SkeletonHorse-Additions.patch index 163838bc3b..cabd8890e8 100644 --- a/Spigot-Server-Patches/0268-SkeletonHorse-Additions.patch +++ b/Spigot-Server-Patches/0268-SkeletonHorse-Additions.patch @@ -1,11 +1,11 @@ -From a641ca430909c6497abe48673d4f735dd149d853 Mon Sep 17 00:00:00 2001 +From 77024b72b00f7087f3eea558af9118926bc13830 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 9ac34dfa8..b96726456 100644 +index 9ac34dfa8c..b967264562 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 9ac34dfa8..b96726456 100644 if (flag != this.bK) { this.bK = flag; diff --git a/src/main/java/net/minecraft/server/PathfinderGoalHorseTrap.java b/src/main/java/net/minecraft/server/PathfinderGoalHorseTrap.java -index 7b0a6f82f..f09374413 100644 +index 7b0a6f82fb..f093744136 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 7b0a6f82f..f09374413 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 e822c2200..2a7d1d4ec 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 diff --git a/Spigot-Server-Patches/0269-Prevent-Saving-Bad-entities-to-chunks.patch b/Spigot-Server-Patches/0269-Prevent-Saving-Bad-entities-to-chunks.patch index 6d374f8a37..3053bf8057 100644 --- a/Spigot-Server-Patches/0269-Prevent-Saving-Bad-entities-to-chunks.patch +++ b/Spigot-Server-Patches/0269-Prevent-Saving-Bad-entities-to-chunks.patch @@ -1,4 +1,4 @@ -From a21ebf5a16f3393e1f025643e143ba81142506f2 Mon Sep 17 00:00:00 2001 +From fcb3584ebcebec7f75d73c6ac3a5e43c5a476fb2 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 1ebb16f0f..2f749fe26 100644 +index 1ebb16f0f6..2f749fe26a 100644 --- a/src/main/java/net/minecraft/server/ChunkRegionLoader.java +++ b/src/main/java/net/minecraft/server/ChunkRegionLoader.java @@ -318,6 +318,7 @@ public class ChunkRegionLoader { diff --git a/Spigot-Server-Patches/0270-Don-t-call-getItemMeta-on-hasItemMeta.patch b/Spigot-Server-Patches/0270-Don-t-call-getItemMeta-on-hasItemMeta.patch index 4a70aaac1c..552a423565 100644 --- a/Spigot-Server-Patches/0270-Don-t-call-getItemMeta-on-hasItemMeta.patch +++ b/Spigot-Server-Patches/0270-Don-t-call-getItemMeta-on-hasItemMeta.patch @@ -1,4 +1,4 @@ -From 3baa0dd9a62fd3e8c3823e6cb8f4c9f12b3c0fec Mon Sep 17 00:00:00 2001 +From 6dbf93ecea2b6327b90c57fab860afcb2517e09a 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 1609e6bbb..8a6a13537 100644 +index 1609e6bbb6..8a6a135372 100644 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java @@ -536,7 +536,7 @@ public final class CraftItemStack extends ItemStack { @@ -24,7 +24,7 @@ index 1609e6bbb..8a6a13537 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 2a0852675..f30f74312 100644 +index 2a0852675b..f30f743121 100644 --- a/src/test/java/org/bukkit/craftbukkit/inventory/ItemMetaTest.java +++ b/src/test/java/org/bukkit/craftbukkit/inventory/ItemMetaTest.java @@ -4,6 +4,7 @@ import static org.hamcrest.Matchers.*; diff --git a/Spigot-Server-Patches/0271-Ignore-Dead-Entities-in-entityList-iteration.patch b/Spigot-Server-Patches/0271-Ignore-Dead-Entities-in-entityList-iteration.patch index a0460bc0ef..eb9d45a150 100644 --- a/Spigot-Server-Patches/0271-Ignore-Dead-Entities-in-entityList-iteration.patch +++ b/Spigot-Server-Patches/0271-Ignore-Dead-Entities-in-entityList-iteration.patch @@ -1,4 +1,4 @@ -From 644a0a58a1a0e6e63e44fe1a7e7d5b61e1398c0f Mon Sep 17 00:00:00 2001 +From 6591870fef5fb0cca16281e97b76921320ca1dec Mon Sep 17 00:00:00 2001 From: Aikar Date: Sat, 28 Jul 2018 12:18:27 -0400 Subject: [PATCH] Ignore Dead Entities in entityList iteration @@ -11,7 +11,7 @@ This will ensure that dead entities are skipped from iteration since they shouldn't of been in the list in the first place. diff --git a/src/main/java/com/destroystokyo/paper/PaperCommand.java b/src/main/java/com/destroystokyo/paper/PaperCommand.java -index ce190d88d..352a39dcb 100644 +index ce190d88d6..352a39dcb3 100644 --- a/src/main/java/com/destroystokyo/paper/PaperCommand.java +++ b/src/main/java/com/destroystokyo/paper/PaperCommand.java @@ -176,6 +176,7 @@ public class PaperCommand extends Command { @@ -23,7 +23,7 @@ index ce190d88d..352a39dcb 100644 MutablePair> info = list.computeIfAbsent(key, k -> MutablePair.of(0, Maps.newHashMap())); ChunkCoordIntPair chunk = new ChunkCoordIntPair(e.getChunkX(), e.getChunkZ()); diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java -index 5d1947f82..197c0fe16 100644 +index 5d1947f826..197c0fe169 100644 --- a/src/main/java/net/minecraft/server/Chunk.java +++ b/src/main/java/net/minecraft/server/Chunk.java @@ -678,6 +678,7 @@ public class Chunk implements IChunkAccess { @@ -51,7 +51,7 @@ index 5d1947f82..197c0fe16 100644 if (oclass.isInstance(t0) && t0.getBoundingBox().c(axisalignedbb) && (predicate == null || predicate.test(t0))) { // Spigot - instance check list.add(t0); diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java -index ba40c2be6..6011935dd 100644 +index 32162003ab..50b6765a55 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java @@ -126,6 +126,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke @@ -63,7 +63,7 @@ index ba40c2be6..6011935dd 100644 private float av; private float aw; diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java -index f6ba51d14..168e19b20 100644 +index f6ba51d14a..168e19b206 100644 --- a/src/main/java/net/minecraft/server/WorldServer.java +++ b/src/main/java/net/minecraft/server/WorldServer.java @@ -836,6 +836,7 @@ public class WorldServer extends World { @@ -91,7 +91,7 @@ index f6ba51d14..168e19b20 100644 } diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -index 4c67f071b..1adced482 100644 +index 09e6abdae2..73e0e47a61 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java @@ -846,6 +846,7 @@ public class CraftWorld implements World { diff --git a/Spigot-Server-Patches/0272-Provide-option-to-use-a-versioned-world-folder-for-t.patch b/Spigot-Server-Patches/0272-Provide-option-to-use-a-versioned-world-folder-for-t.patch index f39b6c94fd..f6a1a11928 100644 --- a/Spigot-Server-Patches/0272-Provide-option-to-use-a-versioned-world-folder-for-t.patch +++ b/Spigot-Server-Patches/0272-Provide-option-to-use-a-versioned-world-folder-for-t.patch @@ -1,4 +1,4 @@ -From 0f69541ea1d4ba682b39102807528e7169e84704 Mon Sep 17 00:00:00 2001 +From daa9cdd5a01f46087aebcb8dade64df763920acf Mon Sep 17 00:00:00 2001 From: Aikar Date: Sun, 29 Jul 2018 15:48:50 -0400 Subject: [PATCH] Provide option to use a versioned world folder for testing @@ -19,7 +19,7 @@ may be some delay there, but region files are only copied on demand. This is highly experiemental so backup your world before relying on this to not modify it diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java -index a9b71c85d..8c3880c83 100644 +index a9b71c85d5..8c3880c838 100644 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java @@ -13,6 +13,7 @@ import java.util.List; @@ -59,7 +59,7 @@ index a9b71c85d..8c3880c83 100644 + } } diff --git a/src/main/java/net/minecraft/server/RegionFileCache.java b/src/main/java/net/minecraft/server/RegionFileCache.java -index 21b3b06f5..871881165 100644 +index 21b3b06f53..8718811655 100644 --- a/src/main/java/net/minecraft/server/RegionFileCache.java +++ b/src/main/java/net/minecraft/server/RegionFileCache.java @@ -10,13 +10,41 @@ import java.io.IOException; @@ -163,7 +163,7 @@ index 21b3b06f5..871881165 100644 + } } diff --git a/src/main/java/net/minecraft/server/WorldNBTStorage.java b/src/main/java/net/minecraft/server/WorldNBTStorage.java -index 350ac42d6..eaae44686 100644 +index 350ac42d6b..eaae446861 100644 --- a/src/main/java/net/minecraft/server/WorldNBTStorage.java +++ b/src/main/java/net/minecraft/server/WorldNBTStorage.java @@ -31,6 +31,58 @@ public class WorldNBTStorage implements IPlayerFileData { diff --git a/Spigot-Server-Patches/0273-MC-111480-Start-Entity-ID-s-at-1.patch b/Spigot-Server-Patches/0273-MC-111480-Start-Entity-ID-s-at-1.patch index 53a174dd40..340eb723a4 100644 --- a/Spigot-Server-Patches/0273-MC-111480-Start-Entity-ID-s-at-1.patch +++ b/Spigot-Server-Patches/0273-MC-111480-Start-Entity-ID-s-at-1.patch @@ -1,4 +1,4 @@ -From 2535e1b20b096933aa3d2616866008b8a9e0ef08 Mon Sep 17 00:00:00 2001 +From 098398ebcb2c5c41089ca9bf130e77d9eba9dc4d Mon Sep 17 00:00:00 2001 From: Aikar Date: Sun, 29 Jul 2018 22:58:47 -0400 Subject: [PATCH] MC-111480: Start Entity ID's at 1 @@ -7,7 +7,7 @@ DataWatchers that store Entity ID's treat 0 as special, and can break things such as Elytra Fireworks. diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java -index 6011935dd..4af1482e2 100644 +index 50b6765a55..8a95e0f117 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java @@ -92,7 +92,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke diff --git a/Spigot-Server-Patches/0274-Implement-Expanded-ArmorStand-API.patch b/Spigot-Server-Patches/0274-Implement-Expanded-ArmorStand-API.patch index b2c0835e91..e36b0754dd 100644 --- a/Spigot-Server-Patches/0274-Implement-Expanded-ArmorStand-API.patch +++ b/Spigot-Server-Patches/0274-Implement-Expanded-ArmorStand-API.patch @@ -1,4 +1,4 @@ -From d35ccc712e7ad1dc95f744fcf1b6cb1946d1d956 Mon Sep 17 00:00:00 2001 +From 291c719701492df0895e89e377610955f1ae40f0 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 81226d604..b5b763191 100644 +index 81226d6042..b5b7631919 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 81226d604..b5b763191 100644 return (this.bE & 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 124c3185b..9f5c3b92e 100644 +index 124c3185bc..9f5c3b92e3 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 { diff --git a/Spigot-Server-Patches/0275-AnvilDamageEvent.patch b/Spigot-Server-Patches/0275-AnvilDamageEvent.patch index 1b6c9d8473..86bdf77f5f 100644 --- a/Spigot-Server-Patches/0275-AnvilDamageEvent.patch +++ b/Spigot-Server-Patches/0275-AnvilDamageEvent.patch @@ -1,11 +1,11 @@ -From 6a0cb1efaaa31bd6bcc605e91f6725d5dcb9d6ee Mon Sep 17 00:00:00 2001 +From 789e49baa6532b77eb1be5a41cdfe91fce6377bf 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 88e706f07..abdcd52c4 100644 +index 88e706f077..abdcd52c46 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 { diff --git a/Spigot-Server-Patches/0276-Add-TNTPrimeEvent.patch b/Spigot-Server-Patches/0276-Add-TNTPrimeEvent.patch index 56243f1954..e52728134e 100644 --- a/Spigot-Server-Patches/0276-Add-TNTPrimeEvent.patch +++ b/Spigot-Server-Patches/0276-Add-TNTPrimeEvent.patch @@ -1,11 +1,11 @@ -From c53b5af7d7c0be966892acba60c082d200c9dbca Mon Sep 17 00:00:00 2001 +From a31616f107acb407fb55170ef648707a7f090b6f 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 f769df41a..087535caf 100644 +index f769df41a6..087535caf9 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; @@ -39,7 +39,7 @@ index f769df41a..087535caf 100644 } } diff --git a/src/main/java/net/minecraft/server/BlockTNT.java b/src/main/java/net/minecraft/server/BlockTNT.java -index 013fa3524..f717ac87c 100644 +index 013fa35241..f717ac87c4 100644 --- a/src/main/java/net/minecraft/server/BlockTNT.java +++ b/src/main/java/net/minecraft/server/BlockTNT.java @@ -1,6 +1,7 @@ @@ -114,7 +114,7 @@ index 013fa3524..f717ac87c 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 0baec5e11..9b2ac3c63 100644 +index 0baec5e119..9b2ac3c63a 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; diff --git a/Spigot-Server-Patches/0277-Break-up-and-make-tab-spam-limits-configurable.patch b/Spigot-Server-Patches/0277-Break-up-and-make-tab-spam-limits-configurable.patch index b2632bf565..ad9b2cb213 100644 --- a/Spigot-Server-Patches/0277-Break-up-and-make-tab-spam-limits-configurable.patch +++ b/Spigot-Server-Patches/0277-Break-up-and-make-tab-spam-limits-configurable.patch @@ -1,4 +1,4 @@ -From c53466a7b3a976448deb0eeb54673b964d4e662a Mon Sep 17 00:00:00 2001 +From 4b2af0d9ba4b51519ef7c85a62deb66ee692c2f0 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 8c3880c83..d773ef5b0 100644 +index 8c3880c838..d773ef5b0d 100644 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java @@ -311,4 +311,18 @@ public class PaperConfig { @@ -45,7 +45,7 @@ index 8c3880c83..d773ef5b0 100644 + } } diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java -index b8cd93302..f30fec7eb 100644 +index 05dec82386..0aa1e2a057 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 { diff --git a/Spigot-Server-Patches/0278-Add-hand-to-bucket-events.patch b/Spigot-Server-Patches/0278-Add-hand-to-bucket-events.patch index 3d1dc84a8f..f1f5fabb3a 100644 --- a/Spigot-Server-Patches/0278-Add-hand-to-bucket-events.patch +++ b/Spigot-Server-Patches/0278-Add-hand-to-bucket-events.patch @@ -1,11 +1,11 @@ -From a6d1b9d71c34b9a778e7db3fdfa04c66ce0e6c9a Mon Sep 17 00:00:00 2001 +From cd45d397f597408561b2b2a556c8c36c45645e62 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 a17738f9f..d2c2e3cc3 100644 +index a17738f9ff..d2c2e3cc33 100644 --- a/src/main/java/net/minecraft/server/EntityCow.java +++ b/src/main/java/net/minecraft/server/EntityCow.java @@ -62,7 +62,7 @@ public class EntityCow extends EntityAnimal { @@ -18,7 +18,7 @@ index a17738f9f..d2c2e3cc3 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 cb2891411..5dc967f8b 100644 +index cb28914118..5dc967f8ba 100644 --- a/src/main/java/net/minecraft/server/ItemBucket.java +++ b/src/main/java/net/minecraft/server/ItemBucket.java @@ -39,7 +39,7 @@ public class ItemBucket extends Item { @@ -67,7 +67,7 @@ index cb2891411..5dc967f8b 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 78baaf625..eec3effef 100644 +index 78baaf6253..eec3effef7 100644 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java @@ -360,6 +360,20 @@ public class CraftEventFactory { diff --git a/Spigot-Server-Patches/0279-MC-135506-Experience-should-save-as-Integers.patch b/Spigot-Server-Patches/0279-MC-135506-Experience-should-save-as-Integers.patch index 6c1a273e0f..7076ac9c9b 100644 --- a/Spigot-Server-Patches/0279-MC-135506-Experience-should-save-as-Integers.patch +++ b/Spigot-Server-Patches/0279-MC-135506-Experience-should-save-as-Integers.patch @@ -1,11 +1,11 @@ -From 3cd82b2c86f45d91488088da69309381fd6afcea Mon Sep 17 00:00:00 2001 +From 7df1842e3f54074dfe3555e625702df27d235743 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 64d71a9a2..65c996961 100644 +index 64d71a9a2a..65c9969613 100644 --- a/src/main/java/net/minecraft/server/EntityExperienceOrb.java +++ b/src/main/java/net/minecraft/server/EntityExperienceOrb.java @@ -204,7 +204,7 @@ public class EntityExperienceOrb extends Entity { diff --git a/Spigot-Server-Patches/0280-Fix-client-rendering-skulls-from-same-user.patch b/Spigot-Server-Patches/0280-Fix-client-rendering-skulls-from-same-user.patch index 4951e7d30c..faf564247c 100644 --- a/Spigot-Server-Patches/0280-Fix-client-rendering-skulls-from-same-user.patch +++ b/Spigot-Server-Patches/0280-Fix-client-rendering-skulls-from-same-user.patch @@ -1,4 +1,4 @@ -From 88d3ebcebfa24aee9f674c8519cf2b4884b96856 Mon Sep 17 00:00:00 2001 +From 8b3d4e5794396398a77a3cb4332f8f27d0f93b4b 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 2acd02f2f..ca1bd0299 100644 +index 2acd02f2f4..ca1bd02995 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 2acd02f2f..ca1bd0299 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 0d67676f7..fa2d3ce8c 100644 +index 0d67676f7d..fa2d3ce8cb 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 0d67676f7..fa2d3ce8c 100644 } // CraftBukkit end diff --git a/src/main/java/net/minecraft/server/PacketPlayOutMapChunk.java b/src/main/java/net/minecraft/server/PacketPlayOutMapChunk.java -index 363ab5da1..d19a30ad8 100644 +index 363ab5da12..d19a30ad87 100644 --- a/src/main/java/net/minecraft/server/PacketPlayOutMapChunk.java +++ b/src/main/java/net/minecraft/server/PacketPlayOutMapChunk.java @@ -51,6 +51,7 @@ public class PacketPlayOutMapChunk implements Packet { @@ -74,7 +74,7 @@ index 363ab5da1..d19a30ad8 100644 this.f.add(nbttagcompound); } diff --git a/src/main/java/net/minecraft/server/TileEntitySkull.java b/src/main/java/net/minecraft/server/TileEntitySkull.java -index 177cceb77..0882d82ce 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 diff --git a/Spigot-Server-Patches/0281-Add-Early-Warning-Feature-to-WatchDog.patch b/Spigot-Server-Patches/0281-Add-Early-Warning-Feature-to-WatchDog.patch index 019007249f..70035056cb 100644 --- a/Spigot-Server-Patches/0281-Add-Early-Warning-Feature-to-WatchDog.patch +++ b/Spigot-Server-Patches/0281-Add-Early-Warning-Feature-to-WatchDog.patch @@ -1,4 +1,4 @@ -From ac2ff8e0612d4e9c9d6f57fe2ff083dd5da5307c Mon Sep 17 00:00:00 2001 +From 58cc66cc331e2986ca540759fd1417417953b3be 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 @@ -9,7 +9,7 @@ thread dumps at an interval until the point of crash. This will help diagnose what was going on in that time before the crash. diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java -index d773ef5b0..833659bbb 100644 +index d773ef5b0d..833659bbb2 100644 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java @@ -25,6 +25,7 @@ import org.bukkit.configuration.file.YamlConfiguration; @@ -36,7 +36,7 @@ index d773ef5b0..833659bbb 100644 public static int tabSpamLimit = 500; private static void tabSpamLimiters() { diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 7e27f1079..3f2a3dd17 100644 +index 7e27f10790..3f2a3dd178 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -847,6 +847,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant Date: Fri, 10 Aug 2018 22:11:49 -0400 Subject: [PATCH] Make EnderDragon implement Mob diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftComplexLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftComplexLivingEntity.java -index cc115cc36..4947249da 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 @@ diff --git a/Spigot-Server-Patches/0283-Detect-and-repair-corrupt-Region-Files.patch b/Spigot-Server-Patches/0283-Detect-and-repair-corrupt-Region-Files.patch index 24575c654a..ef714445a1 100644 --- a/Spigot-Server-Patches/0283-Detect-and-repair-corrupt-Region-Files.patch +++ b/Spigot-Server-Patches/0283-Detect-and-repair-corrupt-Region-Files.patch @@ -1,4 +1,4 @@ -From 14b0e6d38cebae27d8e291c4c0ee396d6155ed48 Mon Sep 17 00:00:00 2001 +From a6fcad582be13be873ddbb394b7cbc778729bddc Mon Sep 17 00:00:00 2001 From: Aikar Date: Sat, 11 Aug 2018 00:49:20 -0400 Subject: [PATCH] Detect and repair corrupt Region Files @@ -11,7 +11,7 @@ I don't know why mojang only checks for 4096, when anything less than 8192 is a But to be safe, it will attempt to back up the file. diff --git a/src/main/java/net/minecraft/server/RegionFile.java b/src/main/java/net/minecraft/server/RegionFile.java -index 4e6288e8b..e68f90194 100644 +index 4e6288e8bb..e68f901943 100644 --- a/src/main/java/net/minecraft/server/RegionFile.java +++ b/src/main/java/net/minecraft/server/RegionFile.java @@ -27,13 +27,13 @@ public class RegionFile implements AutoCloseable { diff --git a/Spigot-Server-Patches/0284-Use-ConcurrentHashMap-in-JsonList.patch b/Spigot-Server-Patches/0284-Use-ConcurrentHashMap-in-JsonList.patch index 57a221a6c4..dbc8ba4578 100644 --- a/Spigot-Server-Patches/0284-Use-ConcurrentHashMap-in-JsonList.patch +++ b/Spigot-Server-Patches/0284-Use-ConcurrentHashMap-in-JsonList.patch @@ -1,4 +1,4 @@ -From fab9440f915a6421a712bf28952ac20a7734157c Mon Sep 17 00:00:00 2001 +From 45cfe4ffa640a85c532b7f79e53bc45de8fc84e1 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 734e7ecf6..8570e38f4 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> { diff --git a/Spigot-Server-Patches/0285-Use-a-Queue-for-Queueing-Commands.patch b/Spigot-Server-Patches/0285-Use-a-Queue-for-Queueing-Commands.patch index acbeb80880..f73a91d379 100644 --- a/Spigot-Server-Patches/0285-Use-a-Queue-for-Queueing-Commands.patch +++ b/Spigot-Server-Patches/0285-Use-a-Queue-for-Queueing-Commands.patch @@ -1,4 +1,4 @@ -From 009051337e6ed3b398fa30636a60c85c48067943 Mon Sep 17 00:00:00 2001 +From c0bf4665aafdddb4e530faac31628ceab037e98d 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 c2c676e3b..3d452fe0e 100644 +index c2c676e3bb..3d452fe0e3 100644 --- a/src/main/java/net/minecraft/server/DedicatedServer.java +++ b/src/main/java/net/minecraft/server/DedicatedServer.java @@ -41,7 +41,7 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer diff --git a/Spigot-Server-Patches/0286-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch b/Spigot-Server-Patches/0286-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch index 082a0d8a29..48adc214c0 100644 --- a/Spigot-Server-Patches/0286-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch +++ b/Spigot-Server-Patches/0286-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch @@ -1,11 +1,11 @@ -From e148a7b56bc3d1103f0fc73a8a71179206ef08ad Mon Sep 17 00:00:00 2001 +From a3a148361baafd41e539bb5601ea9ad255df43a4 Mon Sep 17 00:00:00 2001 From: Aikar Date: Wed, 15 Aug 2018 01:16:34 -0400 Subject: [PATCH] Ability to get Tile Entities from a chunk without snapshots diff --git a/src/main/java/org/bukkit/craftbukkit/CraftChunk.java b/src/main/java/org/bukkit/craftbukkit/CraftChunk.java -index 08f8d8096..011e40458 100644 +index 08f8d80965..011e40458e 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftChunk.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftChunk.java @@ -121,9 +121,16 @@ public class CraftChunk implements Chunk { diff --git a/Spigot-Server-Patches/0287-Allow-disabling-armour-stand-ticking.patch b/Spigot-Server-Patches/0287-Allow-disabling-armour-stand-ticking.patch index 2ad436bce4..b17e41d0d0 100644 --- a/Spigot-Server-Patches/0287-Allow-disabling-armour-stand-ticking.patch +++ b/Spigot-Server-Patches/0287-Allow-disabling-armour-stand-ticking.patch @@ -1,11 +1,11 @@ -From 4b8bf06f1a563ca1dc940e356e0d7c3430b69aaa Mon Sep 17 00:00:00 2001 +From 9768a410bedba5d60aadcbe03d844a9b06aec58b 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/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index f06bb3ae1..a5b4f9990 100644 +index f06bb3ae19..a5b4f99901 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java @@ -391,4 +391,10 @@ public class PaperWorldConfig { @@ -20,7 +20,7 @@ index f06bb3ae1..a5b4f9990 100644 + } } diff --git a/src/main/java/net/minecraft/server/EntityArmorStand.java b/src/main/java/net/minecraft/server/EntityArmorStand.java -index b5b763191..9157dace1 100644 +index b5b7631919..9157dace14 100644 --- a/src/main/java/net/minecraft/server/EntityArmorStand.java +++ b/src/main/java/net/minecraft/server/EntityArmorStand.java @@ -44,6 +44,11 @@ public class EntityArmorStand extends EntityLiving { @@ -140,7 +140,7 @@ index b5b763191..9157dace1 100644 public Vector3f r() { diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java -index 38ca6d6ba..bcbfffb6e 100644 +index d2dddf1c72..1dd8475877 100644 --- a/src/main/java/net/minecraft/server/EntityLiving.java +++ b/src/main/java/net/minecraft/server/EntityLiving.java @@ -2265,52 +2265,7 @@ public abstract class EntityLiving extends Entity { @@ -256,7 +256,7 @@ index 38ca6d6ba..bcbfffb6e 100644 float f2 = MathHelper.g(f - this.aK); diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftArmorStand.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftArmorStand.java -index 9f5c3b92e..07ce93f17 100644 +index 9f5c3b92e3..07ce93f17c 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftArmorStand.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftArmorStand.java @@ -297,5 +297,15 @@ public class CraftArmorStand extends CraftLivingEntity implements ArmorStand { diff --git a/Spigot-Server-Patches/0288-Optimize-BlockPosition-helper-methods.patch b/Spigot-Server-Patches/0288-Optimize-BlockPosition-helper-methods.patch index 0e3f93c807..ec3403519c 100644 --- a/Spigot-Server-Patches/0288-Optimize-BlockPosition-helper-methods.patch +++ b/Spigot-Server-Patches/0288-Optimize-BlockPosition-helper-methods.patch @@ -1,4 +1,4 @@ -From cc8bbf05ab6429cb758dfa601f879eaa5cd4524f Mon Sep 17 00:00:00 2001 +From 89cc4b5da7c6210780dc002d9b43403bd868419e 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 93c3fa78f..07b0cc7b1 100644 +index 93c3fa78f6..07b0cc7b12 100644 --- a/src/main/java/net/minecraft/server/BlockPosition.java +++ b/src/main/java/net/minecraft/server/BlockPosition.java @@ -134,55 +134,72 @@ public class BlockPosition extends BaseBlockPosition implements MinecraftSeriali diff --git a/Spigot-Server-Patches/0289-Send-nearby-packets-from-world-player-list-not-serve.patch b/Spigot-Server-Patches/0289-Send-nearby-packets-from-world-player-list-not-serve.patch index 87c4e812b0..720cb358b7 100644 --- a/Spigot-Server-Patches/0289-Send-nearby-packets-from-world-player-list-not-serve.patch +++ b/Spigot-Server-Patches/0289-Send-nearby-packets-from-world-player-list-not-serve.patch @@ -1,11 +1,11 @@ -From ba09cb8ea6fab09a58a9b4bc23747b715934a83b Mon Sep 17 00:00:00 2001 +From 4059288ed7348a695c83f2bf1b16d0f8200d3def Mon Sep 17 00:00:00 2001 From: Mystiflow Date: Fri, 6 Jul 2018 13:21:30 +0100 Subject: [PATCH] Send nearby packets from world player list not server list diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java -index e940b4b27..0db1e8334 100644 +index e940b4b273..0db1e83340 100644 --- a/src/main/java/net/minecraft/server/PlayerList.java +++ b/src/main/java/net/minecraft/server/PlayerList.java @@ -922,8 +922,25 @@ public abstract class PlayerList { @@ -46,7 +46,7 @@ index e940b4b27..0db1e8334 100644 double d5 = d1 - entityplayer.locY; double d6 = d2 - entityplayer.locZ; diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java -index 168e19b20..d11d01d73 100644 +index 168e19b206..d11d01d739 100644 --- a/src/main/java/net/minecraft/server/WorldServer.java +++ b/src/main/java/net/minecraft/server/WorldServer.java @@ -1179,7 +1179,7 @@ public class WorldServer extends World { @@ -68,7 +68,7 @@ index 168e19b20..d11d01d73 100644 } diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -index 1adced482..1dee89595 100644 +index 73e0e47a61..8499bad15b 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java @@ -1909,7 +1909,7 @@ public class CraftWorld implements World { diff --git a/Spigot-Server-Patches/0290-Restore-vanlla-default-mob-spawn-range.patch b/Spigot-Server-Patches/0290-Restore-vanlla-default-mob-spawn-range.patch index 4f9315a343..201aaea1d0 100644 --- a/Spigot-Server-Patches/0290-Restore-vanlla-default-mob-spawn-range.patch +++ b/Spigot-Server-Patches/0290-Restore-vanlla-default-mob-spawn-range.patch @@ -1,11 +1,11 @@ -From bfb75849b0f55973e8bdb2dcc3bc10360cfa7ac6 Mon Sep 17 00:00:00 2001 +From 86dea7ea3576d109ba69c5d8478315011e91798f 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 9a51c0ef7..c2bf481a6 100644 +index 7f0adb70d1..4c1cb6d7bf 100644 --- a/src/main/java/org/spigotmc/SpigotWorldConfig.java +++ b/src/main/java/org/spigotmc/SpigotWorldConfig.java @@ -152,7 +152,7 @@ public class SpigotWorldConfig diff --git a/Spigot-Server-Patches/0291-Optimize-Hoppers.patch b/Spigot-Server-Patches/0291-Optimize-Hoppers.patch index 19857d6988..2227ece7c3 100644 --- a/Spigot-Server-Patches/0291-Optimize-Hoppers.patch +++ b/Spigot-Server-Patches/0291-Optimize-Hoppers.patch @@ -1,4 +1,4 @@ -From 5db80511dbe36446e31010a6151a4d1ba74881e1 Mon Sep 17 00:00:00 2001 +From 7b46a5370e5a346cbca968500a46f27d1707d849 Mon Sep 17 00:00:00 2001 From: Aikar Date: Wed, 27 Apr 2016 22:09:52 -0400 Subject: [PATCH] Optimize Hoppers @@ -11,7 +11,7 @@ Subject: [PATCH] Optimize Hoppers * Skip subsequent InventoryMoveItemEvents if a plugin does not use the item after first event fire for an iteration diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index a5b4f9990..2b5402b00 100644 +index a5b4f99901..2b5402b009 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java @@ -360,6 +360,15 @@ public class PaperWorldConfig { @@ -31,7 +31,7 @@ index a5b4f9990..2b5402b00 100644 private void disableSprintInterruptionOnAttack() { disableSprintInterruptionOnAttack = getBoolean("game-mechanics.disable-sprint-interruption-on-attack", false); diff --git a/src/main/java/net/minecraft/server/ItemStack.java b/src/main/java/net/minecraft/server/ItemStack.java -index ca1bd0299..2d83c9e79 100644 +index ca1bd02995..2d83c9e79c 100644 --- a/src/main/java/net/minecraft/server/ItemStack.java +++ b/src/main/java/net/minecraft/server/ItemStack.java @@ -482,8 +482,9 @@ public final class ItemStack { @@ -47,7 +47,7 @@ index ca1bd0299..2d83c9e79 100644 itemstack.d(this.C()); if (this.tag != null) { diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 3f2a3dd17..e5c148c48 100644 +index 3f2a3dd178..e5c148c481 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -1126,6 +1126,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant { diff --git a/src/main/java/net/minecraft/server/TileEntity.java b/src/main/java/net/minecraft/server/TileEntity.java -index acce1788d..5188689fb 100644 +index acce1788db..5188689fbb 100644 --- a/src/main/java/net/minecraft/server/TileEntity.java +++ b/src/main/java/net/minecraft/server/TileEntity.java @@ -62,6 +62,7 @@ public abstract class TileEntity implements KeyedObject { // Paper @@ -79,7 +79,7 @@ index acce1788d..5188689fb 100644 this.world.b(this.position, this); if (!this.c.isAir()) { diff --git a/src/main/java/net/minecraft/server/TileEntityHopper.java b/src/main/java/net/minecraft/server/TileEntityHopper.java -index d2833f884..72b4b19d7 100644 +index d2833f8842..72b4b19d7a 100644 --- a/src/main/java/net/minecraft/server/TileEntityHopper.java +++ b/src/main/java/net/minecraft/server/TileEntityHopper.java @@ -189,6 +189,154 @@ public class TileEntityHopper extends TileEntityLootable implements IHopper, ITi diff --git a/Spigot-Server-Patches/0292-Optimize-CraftBlockData-Creation.patch b/Spigot-Server-Patches/0292-Optimize-CraftBlockData-Creation.patch index 6cb144ea4a..ccdd89a324 100644 --- a/Spigot-Server-Patches/0292-Optimize-CraftBlockData-Creation.patch +++ b/Spigot-Server-Patches/0292-Optimize-CraftBlockData-Creation.patch @@ -1,4 +1,4 @@ -From c0a6c61d510621d9ac41e4e2be1be35f02ae6b1c Mon Sep 17 00:00:00 2001 +From 76053be7f92cf0c45d88e6fbce8d4f2012e50bb6 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 0f4aa698a..c66cabe82 100644 +index 0f4aa698aa..c66cabe82f 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 0f4aa698a..c66cabe82 100644 return this.getBlock().l(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 c1666a9ba..3c29abd52 100644 +index c1666a9baf..3c29abd525 100644 --- a/src/main/java/org/bukkit/craftbukkit/block/data/CraftBlockData.java +++ b/src/main/java/org/bukkit/craftbukkit/block/data/CraftBlockData.java @@ -539,7 +539,17 @@ public class CraftBlockData implements BlockData { diff --git a/Spigot-Server-Patches/0293-Fix-MC-124320.patch b/Spigot-Server-Patches/0293-Fix-MC-124320.patch index 8ceb0504c2..73311bf977 100644 --- a/Spigot-Server-Patches/0293-Fix-MC-124320.patch +++ b/Spigot-Server-Patches/0293-Fix-MC-124320.patch @@ -1,11 +1,11 @@ -From 15d570e40fb66d7068ada15a00b9230d8a484c09 Mon Sep 17 00:00:00 2001 +From fbf426f28f91f86b2d67097486821e00442df970 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 03d3090b3..0bddca623 100644 +index 03d3090b3f..0bddca623e 100644 --- a/src/main/java/net/minecraft/server/Block.java +++ b/src/main/java/net/minecraft/server/Block.java @@ -167,6 +167,7 @@ public class Block implements IMaterial { @@ -17,7 +17,7 @@ index 03d3090b3..0bddca623 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 6db334cb5..5e850db32 100644 +index 6db334cb59..5e850db327 100644 --- a/src/main/java/net/minecraft/server/EntityEnderman.java +++ b/src/main/java/net/minecraft/server/EntityEnderman.java @@ -335,8 +335,9 @@ public class EntityEnderman extends EntityMonster { diff --git a/Spigot-Server-Patches/0294-Slime-Pathfinder-Events.patch b/Spigot-Server-Patches/0294-Slime-Pathfinder-Events.patch index b60dab4d07..8d8192c4af 100644 --- a/Spigot-Server-Patches/0294-Slime-Pathfinder-Events.patch +++ b/Spigot-Server-Patches/0294-Slime-Pathfinder-Events.patch @@ -1,11 +1,11 @@ -From 6b1aeaa32956a74aca60a99dd331de59130561cc Mon Sep 17 00:00:00 2001 +From 3ffe23a29863169a8508beafebe182eed2baf7b0 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 96cf4bcce..e28c0673d 100644 +index 96cf4bccea..e28c0673dd 100644 --- a/src/main/java/net/minecraft/server/EntitySlime.java +++ b/src/main/java/net/minecraft/server/EntitySlime.java @@ -2,6 +2,14 @@ package net.minecraft.server; @@ -147,7 +147,7 @@ index 96cf4bcce..e28c0673d 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 ce6ed6e89..6e9f1b66d 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 { diff --git a/Spigot-Server-Patches/0295-Configurable-speed-for-water-flowing-over-lava.patch b/Spigot-Server-Patches/0295-Configurable-speed-for-water-flowing-over-lava.patch index c72e02ca6f..875b872b45 100644 --- a/Spigot-Server-Patches/0295-Configurable-speed-for-water-flowing-over-lava.patch +++ b/Spigot-Server-Patches/0295-Configurable-speed-for-water-flowing-over-lava.patch @@ -1,11 +1,11 @@ -From abfb652364a9c4facf9df8e982e634c8d27bbc25 Mon Sep 17 00:00:00 2001 +From f8a365cb2aec0ff53a6fea230a9fdde2b29aae6f 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 2b5402b00..2c27be63e 100644 +index 2b5402b009..2c27be63ea 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java @@ -401,6 +401,12 @@ public class PaperWorldConfig { @@ -22,7 +22,7 @@ index 2b5402b00..2c27be63e 100644 private void armorStandTick() { this.armorStandTick = this.getBoolean("armor-stands-tick", this.armorStandTick); diff --git a/src/main/java/net/minecraft/server/BlockFluids.java b/src/main/java/net/minecraft/server/BlockFluids.java -index 44e00339f..b4616f259 100644 +index 44e00339f2..b4616f259e 100644 --- a/src/main/java/net/minecraft/server/BlockFluids.java +++ b/src/main/java/net/minecraft/server/BlockFluids.java @@ -70,11 +70,27 @@ public class BlockFluids extends Block implements IFluidSource { diff --git a/Spigot-Server-Patches/0296-Optimize-RegistryMaterials.patch b/Spigot-Server-Patches/0296-Optimize-RegistryMaterials.patch index d5da6d4dd5..f6350b6cbd 100644 --- a/Spigot-Server-Patches/0296-Optimize-RegistryMaterials.patch +++ b/Spigot-Server-Patches/0296-Optimize-RegistryMaterials.patch @@ -1,4 +1,4 @@ -From 32bfb272a008220c31db88ee42df185263cdbd10 Mon Sep 17 00:00:00 2001 +From 12e27b2338d7d8288e2827868316aacaf05dc9ac 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 f291e05b2..fed38e6ef 100644 +index f291e05b26..fed38e6ef0 100644 --- a/src/main/java/net/minecraft/server/RegistryMaterials.java +++ b/src/main/java/net/minecraft/server/RegistryMaterials.java @@ -16,9 +16,9 @@ import org.apache.logging.log4j.Logger; diff --git a/Spigot-Server-Patches/0297-Add-PhantomPreSpawnEvent.patch b/Spigot-Server-Patches/0297-Add-PhantomPreSpawnEvent.patch index df4d530a70..1253a6305d 100644 --- a/Spigot-Server-Patches/0297-Add-PhantomPreSpawnEvent.patch +++ b/Spigot-Server-Patches/0297-Add-PhantomPreSpawnEvent.patch @@ -1,11 +1,11 @@ -From 9a8d8a8a98df2922bfcc24f9b967c36f7625881a Mon Sep 17 00:00:00 2001 +From 11ff740e978329f392eb11a8d747a25985b96238 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 e5ed5a3dc..e5d032d02 100644 +index e5ed5a3dcc..e5d032d02b 100644 --- a/src/main/java/net/minecraft/server/EntityPhantom.java +++ b/src/main/java/net/minecraft/server/EntityPhantom.java @@ -129,6 +129,11 @@ public class EntityPhantom extends EntityFlying implements IMonster { @@ -48,7 +48,7 @@ index e5ed5a3dc..e5d032d02 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 9f64d81c6..1818e7c38 100644 +index 9f64d81c64..1818e7c384 100644 --- a/src/main/java/net/minecraft/server/MobSpawnerPhantom.java +++ b/src/main/java/net/minecraft/server/MobSpawnerPhantom.java @@ -50,8 +50,17 @@ public class MobSpawnerPhantom { @@ -71,7 +71,7 @@ index 9f64d81c6..1818e7c38 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 9f9ee9239..2b9731369 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 { diff --git a/Spigot-Server-Patches/0298-Add-More-Creeper-API.patch b/Spigot-Server-Patches/0298-Add-More-Creeper-API.patch index b4379ab92d..dae34c917f 100644 --- a/Spigot-Server-Patches/0298-Add-More-Creeper-API.patch +++ b/Spigot-Server-Patches/0298-Add-More-Creeper-API.patch @@ -1,11 +1,11 @@ -From 8019f8f65473194da8cafb6252780a2e47ab043a Mon Sep 17 00:00:00 2001 +From 8604b42e0a2439feed5e5106eee9b3961c7bb123 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 29569805c..0c2c3c730 100644 +index 29569805cb..0c2c3c7308 100644 --- a/src/main/java/net/minecraft/server/EntityCreeper.java +++ b/src/main/java/net/minecraft/server/EntityCreeper.java @@ -13,7 +13,7 @@ public class EntityCreeper extends EntityMonster { @@ -47,7 +47,7 @@ index 29569805c..0c2c3c730 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 796ee9e40..2d38823c5 100644 +index 796ee9e40d..2d38823c57 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftCreeper.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftCreeper.java @@ -78,4 +78,22 @@ public class CraftCreeper extends CraftMonster implements Creeper { diff --git a/Spigot-Server-Patches/0299-Inventory-removeItemAnySlot.patch b/Spigot-Server-Patches/0299-Inventory-removeItemAnySlot.patch index 48be1e1748..8835a1385f 100644 --- a/Spigot-Server-Patches/0299-Inventory-removeItemAnySlot.patch +++ b/Spigot-Server-Patches/0299-Inventory-removeItemAnySlot.patch @@ -1,11 +1,11 @@ -From fe90e35388bd795eec603c54e5b9f03504ab4d65 Mon Sep 17 00:00:00 2001 +From 4685709d910dcf17622d93125457533c4608e6ec 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 deb9de366..f05f4c1da 100644 +index deb9de366a..f05f4c1da6 100644 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventory.java +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventory.java @@ -224,10 +224,16 @@ public class CraftInventory implements Inventory { diff --git a/Spigot-Server-Patches/0300-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch b/Spigot-Server-Patches/0300-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch index d0b96cfe59..f26282deab 100644 --- a/Spigot-Server-Patches/0300-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch +++ b/Spigot-Server-Patches/0300-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch @@ -1,4 +1,4 @@ -From 02120a333974283be68c84856bc84a770cf3d11e Mon Sep 17 00:00:00 2001 +From 6246d79f8cfb4ff2b113edd6442ebebff1edb02b 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 1dee89595..1b2c5012e 100644 +index 8499bad15b..d4bad21560 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java @@ -477,7 +477,7 @@ public class CraftWorld implements World { diff --git a/Spigot-Server-Patches/0301-Add-ray-tracing-methods-to-LivingEntity.patch b/Spigot-Server-Patches/0301-Add-ray-tracing-methods-to-LivingEntity.patch index b9d207fdda..bd0e4133e7 100644 --- a/Spigot-Server-Patches/0301-Add-ray-tracing-methods-to-LivingEntity.patch +++ b/Spigot-Server-Patches/0301-Add-ray-tracing-methods-to-LivingEntity.patch @@ -1,11 +1,11 @@ -From 9481e0e03256d681a474de867b071241d538e0da Mon Sep 17 00:00:00 2001 +From d58d391f374687aa0fc4e6d9ea54080e12f7ed19 Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Mon, 3 Sep 2018 18:20:03 -0500 Subject: [PATCH] Add ray tracing methods to LivingEntity diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java -index bcbfffb6e..75285a7b8 100644 +index 1dd8475877..19e7114cbb 100644 --- a/src/main/java/net/minecraft/server/EntityLiving.java +++ b/src/main/java/net/minecraft/server/EntityLiving.java @@ -3176,6 +3176,23 @@ public abstract class EntityLiving extends Entity { @@ -33,7 +33,7 @@ index bcbfffb6e..75285a7b8 100644 public int getShieldBlockingDelay() { diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java -index 8dea7d36b..d5c4115a8 100644 +index 8dea7d36b6..d5c4115a85 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java @@ -182,6 +182,28 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity { diff --git a/Spigot-Server-Patches/0302-Expose-attack-cooldown-methods-for-Player.patch b/Spigot-Server-Patches/0302-Expose-attack-cooldown-methods-for-Player.patch index dc2bf42c86..2aca11fc8e 100644 --- a/Spigot-Server-Patches/0302-Expose-attack-cooldown-methods-for-Player.patch +++ b/Spigot-Server-Patches/0302-Expose-attack-cooldown-methods-for-Player.patch @@ -1,11 +1,11 @@ -From 5074e612f962da4b9641b20f55e69cdd7bfb15b3 Mon Sep 17 00:00:00 2001 +From 542f3de9159d167131a8bf763a96babb6e498c48 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 e316e2af7..87c4902f8 100644 +index e316e2af7d..87c4902f83 100644 --- a/src/main/java/net/minecraft/server/EntityHuman.java +++ b/src/main/java/net/minecraft/server/EntityHuman.java @@ -2004,14 +2004,17 @@ public abstract class EntityHuman extends EntityLiving { @@ -27,7 +27,7 @@ index e316e2af7..87c4902f8 100644 this.aD = 0; } diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index ba60ece45..0386452a8 100644 +index ba60ece457..0386452a8d 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -1908,6 +1908,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player { diff --git a/Spigot-Server-Patches/0303-Improve-death-events.patch b/Spigot-Server-Patches/0303-Improve-death-events.patch index 2c39975509..7e639dd39d 100644 --- a/Spigot-Server-Patches/0303-Improve-death-events.patch +++ b/Spigot-Server-Patches/0303-Improve-death-events.patch @@ -1,4 +1,4 @@ -From 969ea3882a7eda13cf410f1a5aeafd39a41b6920 Mon Sep 17 00:00:00 2001 +From 55e02d7b7e7b4afb4412c500f2ec4d4d86e0fe96 Mon Sep 17 00:00:00 2001 From: Phoenix616 Date: Tue, 21 Aug 2018 01:39:35 +0100 Subject: [PATCH] Improve death events @@ -15,7 +15,7 @@ items and experience which is otherwise only properly possible by using internal code. diff --git a/src/main/java/net/minecraft/server/CombatTracker.java b/src/main/java/net/minecraft/server/CombatTracker.java -index 84c3ea9d0..f563a7b63 100644 +index 84c3ea9d00..f563a7b630 100644 --- a/src/main/java/net/minecraft/server/CombatTracker.java +++ b/src/main/java/net/minecraft/server/CombatTracker.java @@ -175,6 +175,7 @@ public class CombatTracker { @@ -27,7 +27,7 @@ index 84c3ea9d0..f563a7b63 100644 int i = this.f ? 300 : 100; diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java -index 4af1482e2..a8a3f4838 100644 +index 8a95e0f117..3a41137298 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java @@ -1467,6 +1467,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke @@ -47,7 +47,7 @@ index 4af1482e2..a8a3f4838 100644 protected void i(double d0, double d1, double d2) { diff --git a/src/main/java/net/minecraft/server/EntityArmorStand.java b/src/main/java/net/minecraft/server/EntityArmorStand.java -index 9157dace1..235ca47e1 100644 +index 9157dace14..235ca47e16 100644 --- a/src/main/java/net/minecraft/server/EntityArmorStand.java +++ b/src/main/java/net/minecraft/server/EntityArmorStand.java @@ -676,7 +676,8 @@ public class EntityArmorStand extends EntityLiving { @@ -61,7 +61,7 @@ index 9157dace1..235ca47e1 100644 } diff --git a/src/main/java/net/minecraft/server/EntityFox.java b/src/main/java/net/minecraft/server/EntityFox.java -index 85b32a8ac..14046c98d 100644 +index 85202abbc9..8c30b34f28 100644 --- a/src/main/java/net/minecraft/server/EntityFox.java +++ b/src/main/java/net/minecraft/server/EntityFox.java @@ -597,15 +597,25 @@ public class EntityFox extends EntityAnimal { @@ -94,7 +94,7 @@ index 85b32a8ac..14046c98d 100644 public static boolean a(EntityFox entityfox, EntityLiving entityliving) { diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java -index 75285a7b8..dd6e80c6f 100644 +index 19e7114cbb..c357339c26 100644 --- a/src/main/java/net/minecraft/server/EntityLiving.java +++ b/src/main/java/net/minecraft/server/EntityLiving.java @@ -85,7 +85,7 @@ public abstract class EntityLiving extends Entity { @@ -249,7 +249,7 @@ index 75285a7b8..dd6e80c6f 100644 return this.isBaby() ? (this.random.nextFloat() - this.random.nextFloat()) * 0.2F + 1.5F : (this.random.nextFloat() - this.random.nextFloat()) * 0.2F + 1.0F; } diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java -index 30b684b04..343680e3b 100644 +index 30b684b043..343680e3ba 100644 --- a/src/main/java/net/minecraft/server/EntityPlayer.java +++ b/src/main/java/net/minecraft/server/EntityPlayer.java @@ -75,6 +75,10 @@ public class EntityPlayer extends EntityHuman implements ICrafting { @@ -300,7 +300,7 @@ index 30b684b04..343680e3b 100644 } } diff --git a/src/main/java/org/bukkit/craftbukkit/CraftSound.java b/src/main/java/org/bukkit/craftbukkit/CraftSound.java -index 73cb64e09..9f317ff2e 100644 +index 73cb64e09d..9f317ff2e8 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftSound.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftSound.java @@ -806,6 +806,22 @@ public enum CraftSound { @@ -327,7 +327,7 @@ index 73cb64e09..9f317ff2e 100644 this.minecraftKey = minecraftKey; } diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index 0386452a8..deacc2187 100644 +index 0386452a8d..deacc21873 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -1712,7 +1712,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player { @@ -348,7 +348,7 @@ index 0386452a8..deacc2187 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 eec3effef..0d6676559 100644 +index eec3effef7..0d66765591 100644 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java @@ -736,9 +736,16 @@ public class CraftEventFactory { diff --git a/Spigot-Server-Patches/0304-Allow-chests-to-be-placed-with-NBT-data.patch b/Spigot-Server-Patches/0304-Allow-chests-to-be-placed-with-NBT-data.patch index 180d4f61c0..099db55e9e 100644 --- a/Spigot-Server-Patches/0304-Allow-chests-to-be-placed-with-NBT-data.patch +++ b/Spigot-Server-Patches/0304-Allow-chests-to-be-placed-with-NBT-data.patch @@ -1,11 +1,11 @@ -From 9772ae9495bfe35580ea06f7f72c1a782f1d0d51 Mon Sep 17 00:00:00 2001 +From 78009e13febbe94c700f0a89bf9367f4c3135690 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 2d83c9e79..dec589463 100644 +index 2d83c9e79c..dec5894637 100644 --- a/src/main/java/net/minecraft/server/ItemStack.java +++ b/src/main/java/net/minecraft/server/ItemStack.java @@ -235,6 +235,7 @@ public final class ItemStack { @@ -17,7 +17,7 @@ index 2d83c9e79..dec589463 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 85b450c05..efc153de5 100644 +index 85b450c054..efc153de5f 100644 --- a/src/main/java/net/minecraft/server/TileEntityChest.java +++ b/src/main/java/net/minecraft/server/TileEntityChest.java @@ -309,7 +309,7 @@ public class TileEntityChest extends TileEntityLootable { // Paper - Remove ITic diff --git a/Spigot-Server-Patches/0305-Mob-Pathfinding-API.patch b/Spigot-Server-Patches/0305-Mob-Pathfinding-API.patch index d2ea7df473..37e16d00b4 100644 --- a/Spigot-Server-Patches/0305-Mob-Pathfinding-API.patch +++ b/Spigot-Server-Patches/0305-Mob-Pathfinding-API.patch @@ -1,4 +1,4 @@ -From 1587b51bec1ce7a96523277231195fdfecd111b2 Mon Sep 17 00:00:00 2001 +From 03a0ee88b7f677ae26c4e52a9d00ac5501081dd2 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 000000000..f68a07cb9 +index 0000000000..f68a07cb96 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/entity/PaperPathfinder.java @@ -0,0 +1,111 @@ @@ -123,7 +123,7 @@ index 000000000..f68a07cb9 + } +} diff --git a/src/main/java/net/minecraft/server/NavigationAbstract.java b/src/main/java/net/minecraft/server/NavigationAbstract.java -index a473c03b9..856ff22b0 100644 +index a473c03b9d..856ff22b04 100644 --- a/src/main/java/net/minecraft/server/NavigationAbstract.java +++ b/src/main/java/net/minecraft/server/NavigationAbstract.java @@ -67,7 +67,7 @@ public abstract class NavigationAbstract { @@ -170,7 +170,7 @@ index a473c03b9..856ff22b0 100644 this.pathfindFailures = 0; this.lastFailure = 0; // Paper - Pathfinding optimizations this.c = null; diff --git a/src/main/java/net/minecraft/server/PathEntity.java b/src/main/java/net/minecraft/server/PathEntity.java -index f1d94420c..5fdb60180 100644 +index f1d94420c8..5fdb601801 100644 --- a/src/main/java/net/minecraft/server/PathEntity.java +++ b/src/main/java/net/minecraft/server/PathEntity.java @@ -5,11 +5,12 @@ import javax.annotation.Nullable; @@ -208,7 +208,7 @@ index f1d94420c..5fdb60180 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 955152ef4..4e2cef8f6 100644 +index 955152ef4e..4e2cef8f67 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; @@ -225,7 +225,7 @@ index 955152ef4..4e2cef8f6 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 5bf1cd06f..53c2d154e 100644 +index 5bf1cd06fa..53c2d154ed 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; diff --git a/Spigot-Server-Patches/0306-Prevent-chunk-loading-from-Fluid-Flowing.patch b/Spigot-Server-Patches/0306-Prevent-chunk-loading-from-Fluid-Flowing.patch index 4651b1aa00..86e8f24c96 100644 --- a/Spigot-Server-Patches/0306-Prevent-chunk-loading-from-Fluid-Flowing.patch +++ b/Spigot-Server-Patches/0306-Prevent-chunk-loading-from-Fluid-Flowing.patch @@ -1,11 +1,11 @@ -From 302dc659498a5c22ff5ec29c4d7fc463bca2ea0d Mon Sep 17 00:00:00 2001 +From ec1a1b6e0fa26d95ea26b9438505f5193487447a 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 c76fa0b4b..5f1514360 100644 +index c76fa0b4bf..5f15143603 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 { diff --git a/Spigot-Server-Patches/0307-Implement-an-API-for-CanPlaceOn-and-CanDestroy-NBT-v.patch b/Spigot-Server-Patches/0307-Implement-an-API-for-CanPlaceOn-and-CanDestroy-NBT-v.patch index 23f9fbfa4c..2985e4e565 100644 --- a/Spigot-Server-Patches/0307-Implement-an-API-for-CanPlaceOn-and-CanDestroy-NBT-v.patch +++ b/Spigot-Server-Patches/0307-Implement-an-API-for-CanPlaceOn-and-CanDestroy-NBT-v.patch @@ -1,11 +1,11 @@ -From f696adb8ba9ed229973586dbc852ddbf7143e4a2 Mon Sep 17 00:00:00 2001 +From a85c2df0f54ed8db4a40f297ed3daf9e6a07fa02 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 2574c36d3..1c9edeb31 100644 +index 2574c36d3a..1c9edeb313 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 2574c36d3..1c9edeb31 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 a8b267487..c175c20a9 100644 +index a8b267487f..c175c20a95 100644 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java @@ -86,6 +86,12 @@ import org.bukkit.persistence.PersistentDataContainer; diff --git a/Spigot-Server-Patches/0308-Prevent-Mob-AI-Rules-from-Loading-Chunks.patch b/Spigot-Server-Patches/0308-Prevent-Mob-AI-Rules-from-Loading-Chunks.patch index 446124ded8..228559c3af 100644 --- a/Spigot-Server-Patches/0308-Prevent-Mob-AI-Rules-from-Loading-Chunks.patch +++ b/Spigot-Server-Patches/0308-Prevent-Mob-AI-Rules-from-Loading-Chunks.patch @@ -1,11 +1,11 @@ -From afd115967cece46e05e18a441f4b02d292255a15 Mon Sep 17 00:00:00 2001 +From 0ca8b4d7488912376f029935016014950784818c 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 706be9a73..b1457526e 100644 +index 706be9a736..b1457526ec 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 { @@ -53,7 +53,7 @@ index 706be9a73..b1457526e 100644 return block == this.g && iworldreader.getType(blockposition.up()).isAir() && iworldreader.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 b286934aa..c7e25e2be 100644 +index b286934aa8..c7e25e2be8 100644 --- a/src/main/java/net/minecraft/server/RandomPositionGenerator.java +++ b/src/main/java/net/minecraft/server/RandomPositionGenerator.java @@ -93,6 +93,7 @@ public class RandomPositionGenerator { diff --git a/Spigot-Server-Patches/0309-Prevent-mob-spawning-from-loading-generating-chunks.patch b/Spigot-Server-Patches/0309-Prevent-mob-spawning-from-loading-generating-chunks.patch index 049a47c6d8..337087a576 100644 --- a/Spigot-Server-Patches/0309-Prevent-mob-spawning-from-loading-generating-chunks.patch +++ b/Spigot-Server-Patches/0309-Prevent-mob-spawning-from-loading-generating-chunks.patch @@ -1,4 +1,4 @@ -From a8cf4013da68d6afc7433f20db3fe7fa20f95d45 Mon Sep 17 00:00:00 2001 +From ea11d85a280ee7d946cae6cc25346a54b932194c 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 5da0f2211..94d7bca09 100644 +index 5da0f2211b..94d7bca09d 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 { diff --git a/Spigot-Server-Patches/0310-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch b/Spigot-Server-Patches/0310-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch index 19e277ae6a..ff0ef745f4 100644 --- a/Spigot-Server-Patches/0310-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch +++ b/Spigot-Server-Patches/0310-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch @@ -1,4 +1,4 @@ -From a17c631dfa3d2094949430d8fe51bc72d1273c48 Mon Sep 17 00:00:00 2001 +From f5013af91d1a7df14bc77ef85150049afcd14189 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 9a839d654..72eb669c5 100644 +index 9a839d6540..72eb669c50 100644 --- a/src/main/java/net/minecraft/server/BiomeBase.java +++ b/src/main/java/net/minecraft/server/BiomeBase.java @@ -38,7 +38,7 @@ public abstract class BiomeBase { diff --git a/Spigot-Server-Patches/0311-Implement-furnace-cook-speed-multiplier-API.patch b/Spigot-Server-Patches/0311-Implement-furnace-cook-speed-multiplier-API.patch index 1f3f126256..989f520425 100644 --- a/Spigot-Server-Patches/0311-Implement-furnace-cook-speed-multiplier-API.patch +++ b/Spigot-Server-Patches/0311-Implement-furnace-cook-speed-multiplier-API.patch @@ -1,4 +1,4 @@ -From 51befe7b8aa9a8f663b23ab86883303efa797235 Mon Sep 17 00:00:00 2001 +From 7ca931a7de906fc1d9ef2e206010e6948dc4ca13 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 0f6cd246a..c983d260a 100644 +index 0f6cd246ae..c983d260ae 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 0f6cd246a..c983d260a 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 9cc67915c..1ce10ea04 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 diff --git a/Spigot-Server-Patches/0312-Support-Overriding-World-Seeds.patch b/Spigot-Server-Patches/0312-Support-Overriding-World-Seeds.patch index 2996ac6964..6811a9d400 100644 --- a/Spigot-Server-Patches/0312-Support-Overriding-World-Seeds.patch +++ b/Spigot-Server-Patches/0312-Support-Overriding-World-Seeds.patch @@ -1,4 +1,4 @@ -From e04c7c105982729b3b5fff8537083a3053e86136 Mon Sep 17 00:00:00 2001 +From f334b83d1b8814506c89e7d3ff2c709500f80bc1 Mon Sep 17 00:00:00 2001 From: Aikar Date: Mon, 17 Sep 2018 23:05:31 -0400 Subject: [PATCH] Support Overriding World Seeds @@ -15,7 +15,7 @@ This seed will end up being saved to the world data file, so it is a permanent change in that it won't go back if you remove it from paper.yml diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java -index 833659bbb..ffb18902f 100644 +index 833659bbb2..ffb18902ff 100644 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java @@ -11,6 +11,7 @@ import java.lang.reflect.Modifier; @@ -59,7 +59,7 @@ index 833659bbb..ffb18902f 100644 + } } diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index e5c148c48..74cdf4945 100644 +index e5c148c481..74cdf4945f 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -363,7 +363,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant Date: Mon, 17 Sep 2018 23:37:31 -0400 Subject: [PATCH] Optimize Server World Map @@ -21,7 +21,7 @@ known NMS used methods, but we can add more if naughty plugins are found later. diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldMap.java b/src/main/java/com/destroystokyo/paper/PaperWorldMap.java new file mode 100644 -index 000000000..6bb2f98b4 +index 0000000000..6bb2f98b45 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/PaperWorldMap.java @@ -0,0 +1,191 @@ @@ -217,7 +217,7 @@ index 000000000..6bb2f98b4 + } +} diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 74cdf4945..2bd1e7370 100644 +index 74cdf4945f..2bd1e73702 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -78,7 +78,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 55764deec..dbb8098d6 100644 +index 55764deec4..dbb8098d6c 100644 --- a/src/main/java/net/minecraft/server/MobSpawnerAbstract.java +++ b/src/main/java/net/minecraft/server/MobSpawnerAbstract.java @@ -108,11 +108,11 @@ public abstract class MobSpawnerAbstract { diff --git a/Spigot-Server-Patches/0315-Catch-JsonParseException-in-Entity-and-TE-names.patch b/Spigot-Server-Patches/0315-Catch-JsonParseException-in-Entity-and-TE-names.patch index 9039571ca6..8e34b7bb16 100644 --- a/Spigot-Server-Patches/0315-Catch-JsonParseException-in-Entity-and-TE-names.patch +++ b/Spigot-Server-Patches/0315-Catch-JsonParseException-in-Entity-and-TE-names.patch @@ -1,4 +1,4 @@ -From a8903af3349e74919c220b0049b8eb55d8c9fb8e Mon Sep 17 00:00:00 2001 +From e0349a4d5e4fdb5db87fbf5785fe9215a833ba61 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 4b7aefb7a..9e568d5d1 100644 +index 4b7aefb7a7..9e568d5d15 100644 --- a/src/main/java/net/minecraft/server/CommandBlockListenerAbstract.java +++ b/src/main/java/net/minecraft/server/CommandBlockListenerAbstract.java @@ -56,7 +56,7 @@ public abstract class CommandBlockListenerAbstract implements ICommandListener { @@ -26,7 +26,7 @@ index 4b7aefb7a..9e568d5d1 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 a8a3f4838..bcfc5318f 100644 +index 3a41137298..a6e5ac070c 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java @@ -1651,7 +1651,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke @@ -39,7 +39,7 @@ index a8a3f4838..bcfc5318f 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 6d278a0da..ec3732193 100644 +index 6d278a0da5..ec3732193f 100644 --- a/src/main/java/net/minecraft/server/MCUtil.java +++ b/src/main/java/net/minecraft/server/MCUtil.java @@ -339,4 +339,19 @@ public final class MCUtil { @@ -63,7 +63,7 @@ index 6d278a0da..ec3732193 100644 + } } diff --git a/src/main/java/net/minecraft/server/TileEntityBanner.java b/src/main/java/net/minecraft/server/TileEntityBanner.java -index 1f26d8a02..12264c4d0 100644 +index 1f26d8a022..12264c4d03 100644 --- a/src/main/java/net/minecraft/server/TileEntityBanner.java +++ b/src/main/java/net/minecraft/server/TileEntityBanner.java @@ -57,7 +57,7 @@ public class TileEntityBanner extends TileEntity implements INamableTileEntity { @@ -76,7 +76,7 @@ index 1f26d8a02..12264c4d0 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 473ec2cbd..ab6b86e4e 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 diff --git a/Spigot-Server-Patches/0316-Avoid-dimension-id-collisions.patch b/Spigot-Server-Patches/0316-Avoid-dimension-id-collisions.patch index 8fb70fab44..a389c3ca6d 100644 --- a/Spigot-Server-Patches/0316-Avoid-dimension-id-collisions.patch +++ b/Spigot-Server-Patches/0316-Avoid-dimension-id-collisions.patch @@ -1,4 +1,4 @@ -From 1bb4983dcc90a8ec34eb3ecb6d6f358621928293 Mon Sep 17 00:00:00 2001 +From 827f619e5fb3623e65a1a1b05f65201b61c322a5 Mon Sep 17 00:00:00 2001 From: Brokkonaut Date: Tue, 25 Sep 2018 06:53:43 +0200 Subject: [PATCH] Avoid dimension id collisions @@ -8,7 +8,7 @@ we would reuse an existing dimension id, if some other dimension was unloaded before. diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index eb8eecde6..c97bf8a05 100644 +index e564688ca2..88c6d1d020 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -971,7 +971,7 @@ public final class CraftServer implements Server { diff --git a/Spigot-Server-Patches/0317-Honor-EntityAgeable.ageLock.patch b/Spigot-Server-Patches/0317-Honor-EntityAgeable.ageLock.patch index f5da2f3d48..0653421f22 100644 --- a/Spigot-Server-Patches/0317-Honor-EntityAgeable.ageLock.patch +++ b/Spigot-Server-Patches/0317-Honor-EntityAgeable.ageLock.patch @@ -1,11 +1,11 @@ -From c54bdd2a400eeaf7033a64afdf7ce91ac0031705 Mon Sep 17 00:00:00 2001 +From 9bb5f100e8d22f97aa870afba2dceaa515684098 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 da9740a99..e87754ef3 100644 +index da9740a99e..e87754ef33 100644 --- a/src/main/java/net/minecraft/server/EntityAgeable.java +++ b/src/main/java/net/minecraft/server/EntityAgeable.java @@ -85,6 +85,7 @@ public abstract class EntityAgeable extends EntityCreature { diff --git a/Spigot-Server-Patches/0318-Configurable-connection-throttle-kick-message.patch b/Spigot-Server-Patches/0318-Configurable-connection-throttle-kick-message.patch index e91d16c313..9b22b1fa9f 100644 --- a/Spigot-Server-Patches/0318-Configurable-connection-throttle-kick-message.patch +++ b/Spigot-Server-Patches/0318-Configurable-connection-throttle-kick-message.patch @@ -1,11 +1,11 @@ -From fd4a9d23a2336f7f47eda81a25c0ad427b709208 Mon Sep 17 00:00:00 2001 +From 37852f82d0d98e6cdf440cbaa6d9a8955f020976 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 ffb18902f..2d3861c18 100644 +index ffb18902ff..2d3861c184 100644 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java @@ -275,6 +275,11 @@ public class PaperConfig { @@ -21,7 +21,7 @@ index ffb18902f..2d3861c18 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 07d85e535..4b76c2d14 100644 +index 07d85e5353..4b76c2d14f 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 { diff --git a/Spigot-Server-Patches/0319-Hook-into-CB-plugin-rewrites.patch b/Spigot-Server-Patches/0319-Hook-into-CB-plugin-rewrites.patch index 603d9d9ffe..3d19c98a77 100644 --- a/Spigot-Server-Patches/0319-Hook-into-CB-plugin-rewrites.patch +++ b/Spigot-Server-Patches/0319-Hook-into-CB-plugin-rewrites.patch @@ -1,4 +1,4 @@ -From 4394d1444555825bd83735c3e7da973347f6cc81 Mon Sep 17 00:00:00 2001 +From 58fb96efb0b8bf8638dd001615800d4a746735da Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Wed, 3 Oct 2018 20:09:18 -0400 Subject: [PATCH] Hook into CB plugin rewrites @@ -8,7 +8,7 @@ our own relocation. Also lets us rewrite NMS calls for when we're debugging in an IDE pre-relocate. diff --git a/src/main/java/org/bukkit/craftbukkit/util/Commodore.java b/src/main/java/org/bukkit/craftbukkit/util/Commodore.java -index 467b2d938..61f102355 100644 +index 467b2d9385..61f1023557 100644 --- a/src/main/java/org/bukkit/craftbukkit/util/Commodore.java +++ b/src/main/java/org/bukkit/craftbukkit/util/Commodore.java @@ -6,7 +6,9 @@ import java.io.FileOutputStream; diff --git a/Spigot-Server-Patches/0320-Allow-setting-the-vex-s-summoner.patch b/Spigot-Server-Patches/0320-Allow-setting-the-vex-s-summoner.patch index 1b40e3436f..9a3d6bd1e5 100644 --- a/Spigot-Server-Patches/0320-Allow-setting-the-vex-s-summoner.patch +++ b/Spigot-Server-Patches/0320-Allow-setting-the-vex-s-summoner.patch @@ -1,11 +1,11 @@ -From 68ce300145fc5bf4befd75f734db692b0beac2aa Mon Sep 17 00:00:00 2001 +From b0bd7b520e3bbad74d0b499e5ab6769ec5db99ce 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 d7bea8389..bcda21ba7 100644 +index d7bea83890..bcda21ba71 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 d7bea8389..bcda21ba7 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 169c951ec..2f7df3074 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 { diff --git a/Spigot-Server-Patches/0321-Add-sun-related-API.patch b/Spigot-Server-Patches/0321-Add-sun-related-API.patch index ba2ff3b963..e2361f040c 100644 --- a/Spigot-Server-Patches/0321-Add-sun-related-API.patch +++ b/Spigot-Server-Patches/0321-Add-sun-related-API.patch @@ -1,11 +1,11 @@ -From 1289a5cb120dc44faac5278e9f2b44a74b5827b7 Mon Sep 17 00:00:00 2001 +From 7870b98036432b99de7ef1b689f9942641969c65 Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Sun, 7 Oct 2018 00:54:21 -0500 Subject: [PATCH] Add sun related API diff --git a/src/main/java/net/minecraft/server/EntityInsentient.java b/src/main/java/net/minecraft/server/EntityInsentient.java -index c2771c5d9..c81e53090 100644 +index c2771c5d94..c81e530902 100644 --- a/src/main/java/net/minecraft/server/EntityInsentient.java +++ b/src/main/java/net/minecraft/server/EntityInsentient.java @@ -1326,6 +1326,7 @@ public abstract class EntityInsentient extends EntityLiving { @@ -17,7 +17,7 @@ index c2771c5d9..c81e53090 100644 if (this.world.J() && !this.world.isClientSide) { float f = this.aE(); diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index dbb4eb0a8..d13e4cf73 100644 +index dbb4eb0a88..d13e4cf735 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -667,6 +667,7 @@ public abstract class World implements IIBlockAccess, GeneratorAccess, AutoClose @@ -29,7 +29,7 @@ index dbb4eb0a8..d13e4cf73 100644 return this.d < 4; } diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -index 1b2c5012e..3ebea9693 100644 +index d4bad21560..f4afddba4d 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java @@ -739,6 +739,13 @@ public class CraftWorld implements World { @@ -47,7 +47,7 @@ index 1b2c5012e..3ebea9693 100644 public boolean createExplosion(double x, double y, double z, float power) { return createExplosion(x, y, z, power, false, true); diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftMob.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftMob.java -index 53c2d154e..56c233872 100644 +index 53c2d154ed..56c233872b 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftMob.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftMob.java @@ -68,4 +68,11 @@ public abstract class CraftMob extends CraftLivingEntity implements Mob { diff --git a/Spigot-Server-Patches/0322-Check-Drowned-for-Villager-Aggression-Config.patch b/Spigot-Server-Patches/0322-Check-Drowned-for-Villager-Aggression-Config.patch index 878aab5883..43fc0f1bf8 100644 --- a/Spigot-Server-Patches/0322-Check-Drowned-for-Villager-Aggression-Config.patch +++ b/Spigot-Server-Patches/0322-Check-Drowned-for-Villager-Aggression-Config.patch @@ -1,11 +1,11 @@ -From c7e72a3128b0943ff4c8bdd0bc1da9c94f5a45e7 Mon Sep 17 00:00:00 2001 +From 00e1f88b65b36816f45c0622c3c4e44e03468381 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 0deb51427..7f34cdbc3 100644 +index 0deb51427e..7f34cdbc34 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 { diff --git a/Spigot-Server-Patches/0323-Here-s-Johnny.patch b/Spigot-Server-Patches/0323-Here-s-Johnny.patch index cb186fca0f..7dddc5409d 100644 --- a/Spigot-Server-Patches/0323-Here-s-Johnny.patch +++ b/Spigot-Server-Patches/0323-Here-s-Johnny.patch @@ -1,11 +1,11 @@ -From 5f88da5b478b5a6ae133d917a144eb7926672ba3 Mon Sep 17 00:00:00 2001 +From d4b3955f50dda1a2db47ecc095895196f96b5dd7 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 54c1b7c87..130a2e4ff 100644 +index 54c1b7c878..130a2e4ffe 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 54c1b7c87..130a2e4ff 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 951d47929..5ff957ced 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 { diff --git a/Spigot-Server-Patches/0324-Turtle-API.patch b/Spigot-Server-Patches/0324-Turtle-API.patch index 7f2b33d512..ea40600bd6 100644 --- a/Spigot-Server-Patches/0324-Turtle-API.patch +++ b/Spigot-Server-Patches/0324-Turtle-API.patch @@ -1,11 +1,11 @@ -From c4109fc8bcaf80d55d8cfc864876486343e91065 Mon Sep 17 00:00:00 2001 +From f5e844c93cedc06388a5ad2dc02d69747e4e2b40 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 89792eec4..e4eecf568 100644 +index 89792eec45..e4eecf5688 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 { @@ -104,7 +104,7 @@ index 89792eec4..e4eecf568 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 123a2c75c..8edcf7af6 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 @@ diff --git a/Spigot-Server-Patches/0325-Limit-lightning-strike-effect-distance.patch b/Spigot-Server-Patches/0325-Limit-lightning-strike-effect-distance.patch index c14862ab32..b92ace6432 100644 --- a/Spigot-Server-Patches/0325-Limit-lightning-strike-effect-distance.patch +++ b/Spigot-Server-Patches/0325-Limit-lightning-strike-effect-distance.patch @@ -1,11 +1,11 @@ -From 14e40ff94b5e6404b743ab0977730c7bed4f0d30 Mon Sep 17 00:00:00 2001 +From d7c4e390dd981af803df3b85f4316c28b68b0249 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 2c27be63e..fb44fccc9 100644 +index 2c27be63ea..fb44fccc92 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java @@ -234,6 +234,28 @@ public class PaperWorldConfig { @@ -38,7 +38,7 @@ index 2c27be63e..fb44fccc9 100644 public boolean firePhysicsEventForRedstone = false; private void firePhysicsEventForRedstone() { diff --git a/src/main/java/net/minecraft/server/EntityLightning.java b/src/main/java/net/minecraft/server/EntityLightning.java -index adf68d165..fbcda86b3 100644 +index adf68d1650..fbcda86b38 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 adf68d165..fbcda86b3 100644 --this.lifeTicks; diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java -index d11d01d73..3c986857b 100644 +index d11d01d739..3c986857b2 100644 --- a/src/main/java/net/minecraft/server/WorldServer.java +++ b/src/main/java/net/minecraft/server/WorldServer.java @@ -1179,7 +1179,7 @@ public class WorldServer extends World { diff --git a/Spigot-Server-Patches/0326-MC-50319-Check-other-worlds-for-shooter-of-projectil.patch b/Spigot-Server-Patches/0326-MC-50319-Check-other-worlds-for-shooter-of-projectil.patch index 5b85d923de..745c5c3f88 100644 --- a/Spigot-Server-Patches/0326-MC-50319-Check-other-worlds-for-shooter-of-projectil.patch +++ b/Spigot-Server-Patches/0326-MC-50319-Check-other-worlds-for-shooter-of-projectil.patch @@ -1,4 +1,4 @@ -From f987bc00c8eceaa1aa7c20a28e731c9366a74521 Mon Sep 17 00:00:00 2001 +From 8788b74ab7ffff3300256493c0753ddfaf6b5782 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 c19828ed5..7deeaa083 100644 +index f2f4b2d929..18d28a151a 100644 --- a/src/main/java/net/minecraft/server/EntityProjectile.java +++ b/src/main/java/net/minecraft/server/EntityProjectile.java @@ -213,11 +213,21 @@ public abstract class EntityProjectile extends Entity implements IProjectile { diff --git a/Spigot-Server-Patches/0327-Call-player-spectator-target-events.patch b/Spigot-Server-Patches/0327-Call-player-spectator-target-events.patch index e60357e23e..a27b85ac59 100644 --- a/Spigot-Server-Patches/0327-Call-player-spectator-target-events.patch +++ b/Spigot-Server-Patches/0327-Call-player-spectator-target-events.patch @@ -1,11 +1,11 @@ -From 0879e89d98fed7cc3db36eb1635b98439082a06f Mon Sep 17 00:00:00 2001 +From 19a485f578ae3a525479085eb4296343cd0bcce1 Mon Sep 17 00:00:00 2001 From: Caleb Bassham Date: Fri, 28 Sep 2018 02:32:19 -0500 Subject: [PATCH] Call player spectator target events diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java -index 343680e3b..0e35f6dc2 100644 +index 343680e3ba..0e35f6dc25 100644 --- a/src/main/java/net/minecraft/server/EntityPlayer.java +++ b/src/main/java/net/minecraft/server/EntityPlayer.java @@ -60,7 +60,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting { diff --git a/Spigot-Server-Patches/0328-Add-Velocity-IP-Forwarding-Support.patch b/Spigot-Server-Patches/0328-Add-Velocity-IP-Forwarding-Support.patch index 7c38917346..b988ed9443 100644 --- a/Spigot-Server-Patches/0328-Add-Velocity-IP-Forwarding-Support.patch +++ b/Spigot-Server-Patches/0328-Add-Velocity-IP-Forwarding-Support.patch @@ -1,4 +1,4 @@ -From a1f8c1906de53521774263e39bb27d64fe3ab6f3 Mon Sep 17 00:00:00 2001 +From 3f5ae5288b3b69a9c81cad1f447c630a85742474 Mon Sep 17 00:00:00 2001 From: Andrew Steinborn Date: Mon, 8 Oct 2018 14:36:14 -0400 Subject: [PATCH] Add Velocity IP Forwarding Support @@ -14,7 +14,7 @@ forwarding, and is integrated into the Minecraft login process by using the 1.13 login plugin message packet. diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java -index 2d3861c18..a79cba50e 100644 +index 2d3861c184..a79cba50e0 100644 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java @@ -8,6 +8,7 @@ import java.io.IOException; @@ -55,7 +55,7 @@ index 2d3861c18..a79cba50e 100644 } diff --git a/src/main/java/com/destroystokyo/paper/proxy/VelocityProxy.java b/src/main/java/com/destroystokyo/paper/proxy/VelocityProxy.java new file mode 100644 -index 000000000..fdd8708f9 +index 0000000000..fdd8708f97 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/proxy/VelocityProxy.java @@ -0,0 +1,67 @@ @@ -127,7 +127,7 @@ index 000000000..fdd8708f9 + } +} diff --git a/src/main/java/net/minecraft/server/LoginListener.java b/src/main/java/net/minecraft/server/LoginListener.java -index d4d752ddb..5d46a975e 100644 +index d4d752ddb4..5d46a975e3 100644 --- a/src/main/java/net/minecraft/server/LoginListener.java +++ b/src/main/java/net/minecraft/server/LoginListener.java @@ -42,6 +42,7 @@ public class LoginListener implements PacketLoginInListener { @@ -203,7 +203,7 @@ index d4d752ddb..5d46a975e 100644 } diff --git a/src/main/java/net/minecraft/server/NetworkManager.java b/src/main/java/net/minecraft/server/NetworkManager.java -index efd02bd67..c073b04aa 100644 +index efd02bd67d..c073b04aa9 100644 --- a/src/main/java/net/minecraft/server/NetworkManager.java +++ b/src/main/java/net/minecraft/server/NetworkManager.java @@ -46,7 +46,7 @@ public class NetworkManager extends SimpleChannelInboundHandler> { @@ -216,7 +216,7 @@ index efd02bd67..c073b04aa 100644 public java.util.UUID spoofedUUID; public com.mojang.authlib.properties.Property[] spoofedProfile; diff --git a/src/main/java/net/minecraft/server/PacketDataSerializer.java b/src/main/java/net/minecraft/server/PacketDataSerializer.java -index fa2d3ce8c..dac560c63 100644 +index fa2d3ce8cb..dac560c63f 100644 --- a/src/main/java/net/minecraft/server/PacketDataSerializer.java +++ b/src/main/java/net/minecraft/server/PacketDataSerializer.java @@ -140,6 +140,7 @@ public class PacketDataSerializer extends ByteBuf { @@ -244,7 +244,7 @@ index fa2d3ce8c..dac560c63 100644 int j = this.i(); diff --git a/src/main/java/net/minecraft/server/PacketLoginInCustomPayload.java b/src/main/java/net/minecraft/server/PacketLoginInCustomPayload.java -index 4d1f44139..c1ca6f950 100644 +index 4d1f441395..c1ca6f9501 100644 --- a/src/main/java/net/minecraft/server/PacketLoginInCustomPayload.java +++ b/src/main/java/net/minecraft/server/PacketLoginInCustomPayload.java @@ -4,8 +4,8 @@ import java.io.IOException; @@ -259,7 +259,7 @@ index 4d1f44139..c1ca6f950 100644 public PacketLoginInCustomPayload() {} diff --git a/src/main/java/net/minecraft/server/PacketLoginOutCustomPayload.java b/src/main/java/net/minecraft/server/PacketLoginOutCustomPayload.java -index ae74dc9e1..7eb230f1b 100644 +index ae74dc9e18..7eb230f1b2 100644 --- a/src/main/java/net/minecraft/server/PacketLoginOutCustomPayload.java +++ b/src/main/java/net/minecraft/server/PacketLoginOutCustomPayload.java @@ -10,6 +10,14 @@ public class PacketLoginOutCustomPayload implements Packet Date: Fri, 12 Oct 2018 14:10:46 -0500 Subject: [PATCH] Add more Witch API diff --git a/src/main/java/net/minecraft/server/EntityWitch.java b/src/main/java/net/minecraft/server/EntityWitch.java -index 8b95ec3a8..f30ce9568 100644 +index 8b95ec3a81..f30ce95686 100644 --- a/src/main/java/net/minecraft/server/EntityWitch.java +++ b/src/main/java/net/minecraft/server/EntityWitch.java @@ -1,5 +1,11 @@ @@ -96,7 +96,7 @@ index 8b95ec3a8..f30ce9568 100644 public SoundEffect dW() { 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 bae107e76..b43a2bbd5 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 @@ diff --git a/Spigot-Server-Patches/0330-Fix-MC-93764.patch b/Spigot-Server-Patches/0330-Fix-MC-93764.patch index 45cf5c8215..32be371ea9 100644 --- a/Spigot-Server-Patches/0330-Fix-MC-93764.patch +++ b/Spigot-Server-Patches/0330-Fix-MC-93764.patch @@ -1,11 +1,11 @@ -From cc33b0f83b440a208acb6d1ca4345fbe756dc397 Mon Sep 17 00:00:00 2001 +From 3d00b71729755a10bcbfd5f3b7ca4be9c0e9ace9 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 715faef17..b97408cff 100644 +index 715faef171..b97408cffa 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 { diff --git a/Spigot-Server-Patches/0331-Add-option-to-prevent-players-from-moving-into-unloa.patch b/Spigot-Server-Patches/0331-Add-option-to-prevent-players-from-moving-into-unloa.patch index d9376b8f36..887cbfe912 100644 --- a/Spigot-Server-Patches/0331-Add-option-to-prevent-players-from-moving-into-unloa.patch +++ b/Spigot-Server-Patches/0331-Add-option-to-prevent-players-from-moving-into-unloa.patch @@ -1,4 +1,4 @@ -From 2ea78ad20572cc9e93a58f590e9cf01905460e56 Mon Sep 17 00:00:00 2001 +From e175a843725266b83432fbe0785fc1cada392f30 Mon Sep 17 00:00:00 2001 From: Gabriele C Date: Mon, 22 Oct 2018 17:34:10 +0200 Subject: [PATCH] Add option to prevent players from moving into unloaded diff --git a/Spigot-Server-Patches/0332-Reset-players-airTicks-on-respawn.patch b/Spigot-Server-Patches/0332-Reset-players-airTicks-on-respawn.patch index c615fe1445..f7b7762fbf 100644 --- a/Spigot-Server-Patches/0332-Reset-players-airTicks-on-respawn.patch +++ b/Spigot-Server-Patches/0332-Reset-players-airTicks-on-respawn.patch @@ -1,11 +1,11 @@ -From 036e3fb87860644ac6b6163383cf314adc2a9753 Mon Sep 17 00:00:00 2001 +From d315b670e89491e9ec15d3f4e53642c49b1cbf07 Mon Sep 17 00:00:00 2001 From: GreenMeanie Date: Sat, 20 Oct 2018 22:34:02 -0400 Subject: [PATCH] Reset players airTicks on respawn diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java -index bcfc5318f..9395f3e10 100644 +index a6e5ac070c..85106e601c 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java @@ -2273,7 +2273,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke @@ -18,7 +18,7 @@ index bcfc5318f..9395f3e10 100644 } diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java -index 0e35f6dc2..2f605365f 100644 +index 0e35f6dc25..2f605365f7 100644 --- a/src/main/java/net/minecraft/server/EntityPlayer.java +++ b/src/main/java/net/minecraft/server/EntityPlayer.java @@ -1857,6 +1857,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting { diff --git a/Spigot-Server-Patches/0333-Strip-private-area-unicode-characters-from-signs.patch b/Spigot-Server-Patches/0333-Strip-private-area-unicode-characters-from-signs.patch index c0d333833a..a202135be9 100644 --- a/Spigot-Server-Patches/0333-Strip-private-area-unicode-characters-from-signs.patch +++ b/Spigot-Server-Patches/0333-Strip-private-area-unicode-characters-from-signs.patch @@ -1,4 +1,4 @@ -From e44f34d3173d7a9e16a6e7a74ef205dd935cfd4e Mon Sep 17 00:00:00 2001 +From 51bd90e9a20de8f2e94d761f4b6ebd71aad66ffd Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Tue, 23 Oct 2018 20:53:43 -0400 Subject: [PATCH] Strip private area unicode characters from signs @@ -20,7 +20,7 @@ think of no reason to use it. Fixes GH-1571 diff --git a/src/main/java/net/minecraft/server/TileEntitySign.java b/src/main/java/net/minecraft/server/TileEntitySign.java -index 2c6ce5bae..15b3add9e 100644 +index 2c6ce5bae0..15b3add9ed 100644 --- a/src/main/java/net/minecraft/server/TileEntitySign.java +++ b/src/main/java/net/minecraft/server/TileEntitySign.java @@ -14,6 +14,11 @@ public class TileEntitySign extends TileEntity implements ICommandListener { // diff --git a/Spigot-Server-Patches/0334-Don-t-sleep-after-profile-lookups-if-not-needed.patch b/Spigot-Server-Patches/0334-Don-t-sleep-after-profile-lookups-if-not-needed.patch index ec910b45e7..fd95c67ae3 100644 --- a/Spigot-Server-Patches/0334-Don-t-sleep-after-profile-lookups-if-not-needed.patch +++ b/Spigot-Server-Patches/0334-Don-t-sleep-after-profile-lookups-if-not-needed.patch @@ -1,4 +1,4 @@ -From 7c00d87b4b56b7a22f9f1059cf76bce5db04c6cb Mon Sep 17 00:00:00 2001 +From 8eee4064ed2606c2639130c37c9c63bebbb1dba6 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 71e48e87b..23f1447cf 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 { diff --git a/Spigot-Server-Patches/0335-Use-more-reasonable-thread-count-default-for-bootstr.patch b/Spigot-Server-Patches/0335-Use-more-reasonable-thread-count-default-for-bootstr.patch index 97c3750cf8..f32829a3c4 100644 --- a/Spigot-Server-Patches/0335-Use-more-reasonable-thread-count-default-for-bootstr.patch +++ b/Spigot-Server-Patches/0335-Use-more-reasonable-thread-count-default-for-bootstr.patch @@ -1,11 +1,11 @@ -From 8ad28b03aad516f1544943f0ffa495f4f25bbab3 Mon Sep 17 00:00:00 2001 +From bb7a263fb143216519ba03c0bd73899f80a879d1 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 5fae5a123..6bc576f10 100644 +index 5fae5a1233..6bc576f10f 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 { diff --git a/Spigot-Server-Patches/0336-MC-136865-Use-valid-item-for-enchantment-checks-on-b.patch b/Spigot-Server-Patches/0336-MC-136865-Use-valid-item-for-enchantment-checks-on-b.patch index 3d5a4e1338..4fd584b0d7 100644 --- a/Spigot-Server-Patches/0336-MC-136865-Use-valid-item-for-enchantment-checks-on-b.patch +++ b/Spigot-Server-Patches/0336-MC-136865-Use-valid-item-for-enchantment-checks-on-b.patch @@ -1,4 +1,4 @@ -From 28470a8e6dfd253aa55dba3784e1755692c748d1 Mon Sep 17 00:00:00 2001 +From 2c27350d2a7918d8848331fdd78f9df8eb4a746f Mon Sep 17 00:00:00 2001 From: MisterVector Date: Thu, 1 Nov 2018 14:50:05 -0700 Subject: [PATCH] MC-136865: Use valid item for enchantment checks on block @@ -13,7 +13,7 @@ keep the clone of the item used to a non empty value so it represents the item used. diff --git a/src/main/java/net/minecraft/server/PlayerInteractManager.java b/src/main/java/net/minecraft/server/PlayerInteractManager.java -index 06ea3899a..7f90a617f 100644 +index 06ea3899a6..7f90a617fe 100644 --- a/src/main/java/net/minecraft/server/PlayerInteractManager.java +++ b/src/main/java/net/minecraft/server/PlayerInteractManager.java @@ -354,10 +354,11 @@ public class PlayerInteractManager { diff --git a/Spigot-Server-Patches/0337-Optimize-World-Time-Updates.patch b/Spigot-Server-Patches/0337-Optimize-World-Time-Updates.patch index a7713fd588..9955fe59b5 100644 --- a/Spigot-Server-Patches/0337-Optimize-World-Time-Updates.patch +++ b/Spigot-Server-Patches/0337-Optimize-World-Time-Updates.patch @@ -1,4 +1,4 @@ -From 4e10c1bbd3dff1d841e55af0ad8dcc3f988778a5 Mon Sep 17 00:00:00 2001 +From c22f7871a4a811d70c11af173d6afa7512aa7dc1 Mon Sep 17 00:00:00 2001 From: Aikar Date: Fri, 2 Nov 2018 23:11:51 -0400 Subject: [PATCH] Optimize World Time Updates @@ -8,7 +8,7 @@ the updates per world, so that we can re-use the same packet object for every player unless they have per-player time enabled. diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 2bd1e7370..99306781f 100644 +index 2bd1e73702..99306781f7 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -1110,12 +1110,24 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant Date: Mon, 5 Nov 2018 04:23:51 +0000 Subject: [PATCH] Restore custom InventoryHolder support @@ -17,7 +17,7 @@ will always work as intended in the past, those without will create implementati based inventories. diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/util/CraftInventoryCreator.java b/src/main/java/org/bukkit/craftbukkit/inventory/util/CraftInventoryCreator.java -index 9957ed040..ae280dd40 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 { diff --git a/Spigot-Server-Patches/0339-Use-Vanilla-Minecart-Speeds.patch b/Spigot-Server-Patches/0339-Use-Vanilla-Minecart-Speeds.patch index 114e0b5887..413d5ed60d 100644 --- a/Spigot-Server-Patches/0339-Use-Vanilla-Minecart-Speeds.patch +++ b/Spigot-Server-Patches/0339-Use-Vanilla-Minecart-Speeds.patch @@ -1,4 +1,4 @@ -From 98b3efce4e247621f027b7fe7fb2c43c1b8fcc97 Mon Sep 17 00:00:00 2001 +From 10d5604412735409b648b0b4fe0a0ba848835ca8 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 2a2105cbc..3a3ed039a 100644 +index 2a2105cbce..3a3ed039a2 100644 --- a/src/main/java/net/minecraft/server/EntityMinecartAbstract.java +++ b/src/main/java/net/minecraft/server/EntityMinecartAbstract.java @@ -35,9 +35,9 @@ public abstract class EntityMinecartAbstract extends Entity { diff --git a/Spigot-Server-Patches/0340-Fix-SpongeAbsortEvent-handling.patch b/Spigot-Server-Patches/0340-Fix-SpongeAbsortEvent-handling.patch index cee3633e94..04317b032f 100644 --- a/Spigot-Server-Patches/0340-Fix-SpongeAbsortEvent-handling.patch +++ b/Spigot-Server-Patches/0340-Fix-SpongeAbsortEvent-handling.patch @@ -1,4 +1,4 @@ -From 65f5e94d73159dcc1333e28f1219af0c1bfc28d8 Mon Sep 17 00:00:00 2001 +From 35b7abe7aa93a6b80bea7aef05cc78b13016e74e 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 0bddca623..8f809a4ee 100644 +index 0bddca623e..8f809a4ee4 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 0bddca623..8f809a4ee 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 4e281ce6d..6a64af71b 100644 +index 4e281ce6dd..6a64af71b9 100644 --- a/src/main/java/net/minecraft/server/BlockSponge.java +++ b/src/main/java/net/minecraft/server/BlockSponge.java @@ -113,8 +113,11 @@ public class BlockSponge extends Block { diff --git a/Spigot-Server-Patches/0341-Don-t-allow-digging-into-unloaded-chunks.patch b/Spigot-Server-Patches/0341-Don-t-allow-digging-into-unloaded-chunks.patch index 7d15132cfa..ac9bde5b2e 100644 --- a/Spigot-Server-Patches/0341-Don-t-allow-digging-into-unloaded-chunks.patch +++ b/Spigot-Server-Patches/0341-Don-t-allow-digging-into-unloaded-chunks.patch @@ -1,4 +1,4 @@ -From ff53d25d2dab42d5f8ae418732140404848abe4d Mon Sep 17 00:00:00 2001 +From 54d5124747592430036aba4d807cc9b6cab3369f 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/Spigot-Server-Patches/0342-Optimize-redstone-algorithm.patch b/Spigot-Server-Patches/0342-Optimize-redstone-algorithm.patch index 1255639c6f..c983b075bd 100644 --- a/Spigot-Server-Patches/0342-Optimize-redstone-algorithm.patch +++ b/Spigot-Server-Patches/0342-Optimize-redstone-algorithm.patch @@ -1,4 +1,4 @@ -From 1785bdbd71be84d3988751c7ed8950ca66e03af1 Mon Sep 17 00:00:00 2001 +From 6182c6be4850382a36d038958f64705b6c86114c 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 ad793ffa3..ef882b897 100644 +index ad793ffa38..ef882b897f 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java @@ -439,4 +439,14 @@ public class PaperWorldConfig { @@ -39,7 +39,7 @@ index ad793ffa3..ef882b897 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 000000000..cf5661f1c +index 0000000000..cf5661f1c5 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/util/RedstoneWireTurbo.java @@ -0,0 +1,912 @@ @@ -956,7 +956,7 @@ index 000000000..cf5661f1c + } +} diff --git a/src/main/java/net/minecraft/server/BlockRedstoneWire.java b/src/main/java/net/minecraft/server/BlockRedstoneWire.java -index 7ce9cdb85..6b5015ce5 100644 +index 7ce9cdb853..6b5015ce5f 100644 --- a/src/main/java/net/minecraft/server/BlockRedstoneWire.java +++ b/src/main/java/net/minecraft/server/BlockRedstoneWire.java @@ -1,5 +1,7 @@ @@ -1124,7 +1124,7 @@ index 7ce9cdb85..6b5015ce5 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 d13e4cf73..f811ef8cc 100644 +index d13e4cf735..f811ef8cc8 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -556,6 +556,7 @@ public abstract class World implements IIBlockAccess, GeneratorAccess, AutoClose diff --git a/Spigot-Server-Patches/0343-force-entity-dismount-during-teleportation.patch b/Spigot-Server-Patches/0343-force-entity-dismount-during-teleportation.patch index c7a12ecf24..a19fc8bfeb 100644 --- a/Spigot-Server-Patches/0343-force-entity-dismount-during-teleportation.patch +++ b/Spigot-Server-Patches/0343-force-entity-dismount-during-teleportation.patch @@ -1,4 +1,4 @@ -From 680f38471891cd541474b9b0eade52bb3ccabcaf Mon Sep 17 00:00:00 2001 +From 433c046606075a2bf2bcf46d2a0322de1d657f10 Mon Sep 17 00:00:00 2001 From: Shane Freeder Date: Thu, 15 Nov 2018 13:38:37 +0000 Subject: [PATCH] force entity dismount during teleportation @@ -20,7 +20,7 @@ this is going to be the best soultion all around. Improvements/suggestions welcome! diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java -index 9395f3e10..ea4442d76 100644 +index 85106e601c..73bd0c278a 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java @@ -1995,12 +1995,15 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke @@ -72,7 +72,7 @@ index 9395f3e10..ea4442d76 100644 if (event.isCancelled()) { return false; diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java -index 7d8885ce8..318c2b0dc 100644 +index 87c4902f83..f709e7d87a 100644 --- a/src/main/java/net/minecraft/server/EntityHuman.java +++ b/src/main/java/net/minecraft/server/EntityHuman.java @@ -937,9 +937,11 @@ public abstract class EntityHuman extends EntityLiving { @@ -91,7 +91,7 @@ index 7d8885ce8..318c2b0dc 100644 } diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java -index dd6e80c6f..ae1cda49a 100644 +index c357339c26..2806808328 100644 --- a/src/main/java/net/minecraft/server/EntityLiving.java +++ b/src/main/java/net/minecraft/server/EntityLiving.java @@ -2667,11 +2667,13 @@ public abstract class EntityLiving extends Entity { @@ -112,7 +112,7 @@ index dd6e80c6f..ae1cda49a 100644 this.B(entity); } diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java -index 2f605365f..7f89d45ed 100644 +index 2f605365f7..7f89d45ed2 100644 --- a/src/main/java/net/minecraft/server/EntityPlayer.java +++ b/src/main/java/net/minecraft/server/EntityPlayer.java @@ -997,11 +997,13 @@ public class EntityPlayer extends EntityHuman implements ICrafting { diff --git a/Spigot-Server-Patches/0344-Book-Size-Limits.patch b/Spigot-Server-Patches/0344-Book-Size-Limits.patch index 8c5b934765..ffa131219d 100644 --- a/Spigot-Server-Patches/0344-Book-Size-Limits.patch +++ b/Spigot-Server-Patches/0344-Book-Size-Limits.patch @@ -1,4 +1,4 @@ -From 5897787b256265c9eac41c5164c76fef9f6b29ed Mon Sep 17 00:00:00 2001 +From 38d1b2e0a4399bf6893fb86e4323a909e6b96d86 Mon Sep 17 00:00:00 2001 From: Aikar Date: Fri, 16 Nov 2018 23:08:50 -0500 Subject: [PATCH] Book Size Limits diff --git a/Spigot-Server-Patches/0345-Make-the-default-permission-message-configurable.patch b/Spigot-Server-Patches/0345-Make-the-default-permission-message-configurable.patch index 4004a36cf4..5a4fb0be3a 100644 --- a/Spigot-Server-Patches/0345-Make-the-default-permission-message-configurable.patch +++ b/Spigot-Server-Patches/0345-Make-the-default-permission-message-configurable.patch @@ -1,11 +1,11 @@ -From 8d19fecfab08e3ee23b30fe6a19f00352333adea Mon Sep 17 00:00:00 2001 +From b9819e4d77a1f505863b135a2eb874e994472926 Mon Sep 17 00:00:00 2001 From: Shane Freeder Date: Sun, 18 Nov 2018 19:49:56 +0000 Subject: [PATCH] Make the default permission message configurable diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java -index e5e41c662..8942a06bf 100644 +index e5e41c6621..8942a06bfe 100644 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java @@ -21,6 +21,7 @@ import java.util.regex.Pattern; @@ -29,7 +29,7 @@ index e5e41c662..8942a06bf 100644 private static void savePlayerData() { savePlayerData = getBoolean("settings.save-player-data", savePlayerData); diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index c97bf8a05..88b416f60 100644 +index e667bfb70c..619f8dc819 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -2123,6 +2123,11 @@ public final class CraftServer implements Server { diff --git a/Spigot-Server-Patches/0346-Add-more-Zombie-API.patch b/Spigot-Server-Patches/0346-Add-more-Zombie-API.patch index 383a1798ec..0d8e973091 100644 --- a/Spigot-Server-Patches/0346-Add-more-Zombie-API.patch +++ b/Spigot-Server-Patches/0346-Add-more-Zombie-API.patch @@ -1,11 +1,11 @@ -From 211899db841918fe476f6dac60b11d89df32a80c Mon Sep 17 00:00:00 2001 +From 2642abef7f21bbc925473bdd7fe1b08607409db1 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 c81e53090..48ce15484 100644 +index c81e530902..48ce154848 100644 --- a/src/main/java/net/minecraft/server/EntityInsentient.java +++ b/src/main/java/net/minecraft/server/EntityInsentient.java @@ -1246,6 +1246,8 @@ public abstract class EntityInsentient extends EntityLiving { @@ -18,7 +18,7 @@ index c81e53090..48ce15484 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 171c1ae4a..b20fe8e52 100644 +index 171c1ae4ad..b20fe8e521 100644 --- a/src/main/java/net/minecraft/server/EntityZombie.java +++ b/src/main/java/net/minecraft/server/EntityZombie.java @@ -31,6 +31,7 @@ public class EntityZombie extends EntityMonster { @@ -92,7 +92,7 @@ index 171c1ae4a..b20fe8e52 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 0429cf020..c4320dbb6 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 { diff --git a/Spigot-Server-Patches/0347-Prevent-rayTrace-from-loading-chunks.patch b/Spigot-Server-Patches/0347-Prevent-rayTrace-from-loading-chunks.patch index 1ffc9edb69..33701a6386 100644 --- a/Spigot-Server-Patches/0347-Prevent-rayTrace-from-loading-chunks.patch +++ b/Spigot-Server-Patches/0347-Prevent-rayTrace-from-loading-chunks.patch @@ -1,4 +1,4 @@ -From c5e0aeb093d960e33895c510129db518a3ecee63 Mon Sep 17 00:00:00 2001 +From ad7d8b892528c4becff3fddb592ff47f6cce6cf8 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 577b22775..c5586e44d 100644 +index 577b227758..c5586e44d4 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 { diff --git a/Spigot-Server-Patches/0348-Handle-Large-Packets-disconnecting-client.patch b/Spigot-Server-Patches/0348-Handle-Large-Packets-disconnecting-client.patch index 53084d4561..9d1e5c0275 100644 --- a/Spigot-Server-Patches/0348-Handle-Large-Packets-disconnecting-client.patch +++ b/Spigot-Server-Patches/0348-Handle-Large-Packets-disconnecting-client.patch @@ -1,4 +1,4 @@ -From d654882c23645a74bcaf783541d0b5f59df0bbba Mon Sep 17 00:00:00 2001 +From a6a6ae026b8e06aec07c496b0fb30824accec8e9 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 c073b04aa..1652662ae 100644 +index c073b04aa9..1652662aef 100644 --- a/src/main/java/net/minecraft/server/NetworkManager.java +++ b/src/main/java/net/minecraft/server/NetworkManager.java @@ -99,6 +99,15 @@ public class NetworkManager extends SimpleChannelInboundHandler> { @@ -27,7 +27,7 @@ index c073b04aa..1652662ae 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 601d4d0fa..2d8e6a2f4 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 601d4d0fa..2d8e6a2f4 100644 return false; } diff --git a/src/main/java/net/minecraft/server/PacketEncoder.java b/src/main/java/net/minecraft/server/PacketEncoder.java -index 63c4dbd32..b0cfef52c 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 63c4dbd32..b0cfef52c 100644 + // Paper end } diff --git a/src/main/java/net/minecraft/server/PacketPlayOutMapChunk.java b/src/main/java/net/minecraft/server/PacketPlayOutMapChunk.java -index d19a30ad8..58eccd9c6 100644 +index d19a30ad87..58eccd9c63 100644 --- a/src/main/java/net/minecraft/server/PacketPlayOutMapChunk.java +++ b/src/main/java/net/minecraft/server/PacketPlayOutMapChunk.java @@ -68,7 +68,7 @@ public class PacketPlayOutMapChunk implements Packet { @@ -93,7 +93,7 @@ index d19a30ad8..58eccd9c6 100644 } else { this.e = new byte[i]; diff --git a/src/main/java/net/minecraft/server/PacketPlayOutWindowItems.java b/src/main/java/net/minecraft/server/PacketPlayOutWindowItems.java -index f7c365567..631234324 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 { diff --git a/Spigot-Server-Patches/0349-Lazy-init-world-storage-in-CraftOfflinePlayer.patch b/Spigot-Server-Patches/0349-Lazy-init-world-storage-in-CraftOfflinePlayer.patch index 7f6bb3d37e..f0600a578f 100644 --- a/Spigot-Server-Patches/0349-Lazy-init-world-storage-in-CraftOfflinePlayer.patch +++ b/Spigot-Server-Patches/0349-Lazy-init-world-storage-in-CraftOfflinePlayer.patch @@ -1,4 +1,4 @@ -From 6428cbf266f4dc6e424b49d0ddba22e82c0befe5 Mon Sep 17 00:00:00 2001 +From 4753ac50f69c34f3e150790a684883cca605a114 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 6a448c02e..c1ef1c950 100644 +index 6a448c02ec..c1ef1c950d 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftOfflinePlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftOfflinePlayer.java @@ -25,12 +25,12 @@ import org.bukkit.plugin.Plugin; diff --git a/Spigot-Server-Patches/0350-Add-PlayerConnectionCloseEvent.patch b/Spigot-Server-Patches/0350-Add-PlayerConnectionCloseEvent.patch index 1976bcfb61..16af66ead3 100644 --- a/Spigot-Server-Patches/0350-Add-PlayerConnectionCloseEvent.patch +++ b/Spigot-Server-Patches/0350-Add-PlayerConnectionCloseEvent.patch @@ -1,4 +1,4 @@ -From 0cd2b1da42e4771f25d792ad9387acfcc765b2eb Mon Sep 17 00:00:00 2001 +From 06a6838870f23586bc5804b1aaa9474020d66aea 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 5d46a975e..9e4bc2405 100644 +index 5d46a975e3..9e4bc24058 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 5d46a975e..9e4bc2405 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 1652662ae..23fcdea17 100644 +index 1652662aef..23fcdea176 100644 --- a/src/main/java/net/minecraft/server/NetworkManager.java +++ b/src/main/java/net/minecraft/server/NetworkManager.java @@ -346,6 +346,26 @@ public class NetworkManager extends SimpleChannelInboundHandler> { diff --git a/Spigot-Server-Patches/0351-Prevent-Enderman-from-loading-chunks.patch b/Spigot-Server-Patches/0351-Prevent-Enderman-from-loading-chunks.patch index 8a95a200f7..a74beb33c8 100644 --- a/Spigot-Server-Patches/0351-Prevent-Enderman-from-loading-chunks.patch +++ b/Spigot-Server-Patches/0351-Prevent-Enderman-from-loading-chunks.patch @@ -1,11 +1,11 @@ -From ef680ce19df7c5e78efe920d3a6f015aa1a80cea Mon Sep 17 00:00:00 2001 +From 4e3163b7e24f7aeda021e9a31186d1da953b3e24 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 5e850db32..d4c4dc2fd 100644 +index 5e850db327..d4c4dc2fdc 100644 --- a/src/main/java/net/minecraft/server/EntityEnderman.java +++ b/src/main/java/net/minecraft/server/EntityEnderman.java @@ -325,7 +325,8 @@ public class EntityEnderman extends EntityMonster { diff --git a/Spigot-Server-Patches/0352-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch b/Spigot-Server-Patches/0352-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch index 4f7a393e57..256ce4a3da 100644 --- a/Spigot-Server-Patches/0352-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch +++ b/Spigot-Server-Patches/0352-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch @@ -1,4 +1,4 @@ -From 3ce57cf192543240a80794ce558716f8e3f0e15a Mon Sep 17 00:00:00 2001 +From 1cd8e83ad1aaa30c3ba4407bfd6ea2a85b364a97 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 7f89d45ed..64d1b72a8 100644 +index 7f89d45ed2..64d1b72a87 100644 --- a/src/main/java/net/minecraft/server/EntityPlayer.java +++ b/src/main/java/net/minecraft/server/EntityPlayer.java @@ -75,6 +75,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting { @@ -28,7 +28,7 @@ index 7f89d45ed..64d1b72a8 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 0db1e8334..0aafa1b60 100644 +index 0db1e83340..0aafa1b609 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 0db1e8334..0aafa1b60 100644 UserCache usercache = this.server.getUserCache(); GameProfile gameprofile1 = usercache.a(gameprofile.getId()); diff --git a/src/main/java/org/bukkit/craftbukkit/CraftOfflinePlayer.java b/src/main/java/org/bukkit/craftbukkit/CraftOfflinePlayer.java -index c1ef1c950..3824180ee 100644 +index c1ef1c950d..3824180ee5 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftOfflinePlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftOfflinePlayer.java @@ -256,6 +256,61 @@ public class CraftOfflinePlayer implements OfflinePlayer, ConfigurationSerializa @@ -106,7 +106,7 @@ index c1ef1c950..3824180ee 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 deacc2187..367e8cfc1 100644 +index deacc21873..367e8cfc13 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -137,6 +137,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player { diff --git a/Spigot-Server-Patches/0353-Fix-PlayerEditBookEvent.patch b/Spigot-Server-Patches/0353-Fix-PlayerEditBookEvent.patch index 8478b87c54..6ba546558c 100644 --- a/Spigot-Server-Patches/0353-Fix-PlayerEditBookEvent.patch +++ b/Spigot-Server-Patches/0353-Fix-PlayerEditBookEvent.patch @@ -1,4 +1,4 @@ -From ec9197283cbd2177f245472cee5cc16931cf91e1 Mon Sep 17 00:00:00 2001 +From 00c386d25dbdcb2bb94ab0116b1beaa2696708ab Mon Sep 17 00:00:00 2001 From: Michael Himing Date: Sun, 16 Dec 2018 13:07:33 +1100 Subject: [PATCH] Fix PlayerEditBookEvent diff --git a/Spigot-Server-Patches/0354-Workaround-for-vehicle-tracking-issue-on-disconnect.patch b/Spigot-Server-Patches/0354-Workaround-for-vehicle-tracking-issue-on-disconnect.patch index 5f808ec542..d16906785e 100644 --- a/Spigot-Server-Patches/0354-Workaround-for-vehicle-tracking-issue-on-disconnect.patch +++ b/Spigot-Server-Patches/0354-Workaround-for-vehicle-tracking-issue-on-disconnect.patch @@ -1,11 +1,11 @@ -From bbeecf1f284a7d540827e4b609de84052fb4bfce Mon Sep 17 00:00:00 2001 +From f91ab5badc408129e4af14c9604479b26da3e593 Mon Sep 17 00:00:00 2001 From: connorhartley Date: Mon, 7 Jan 2019 14:43:48 -0600 Subject: [PATCH] Workaround for vehicle tracking issue on disconnect diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java -index 64d1b72a8..0a67f48f6 100644 +index 64d1b72a87..0a67f48f66 100644 --- a/src/main/java/net/minecraft/server/EntityPlayer.java +++ b/src/main/java/net/minecraft/server/EntityPlayer.java @@ -1280,6 +1280,13 @@ public class EntityPlayer extends EntityHuman implements ICrafting { diff --git a/Spigot-Server-Patches/0355-Fire-BlockPistonRetractEvent-for-all-empty-pistons.patch b/Spigot-Server-Patches/0355-Fire-BlockPistonRetractEvent-for-all-empty-pistons.patch index e497a65523..1a2b7f68a0 100644 --- a/Spigot-Server-Patches/0355-Fire-BlockPistonRetractEvent-for-all-empty-pistons.patch +++ b/Spigot-Server-Patches/0355-Fire-BlockPistonRetractEvent-for-all-empty-pistons.patch @@ -1,4 +1,4 @@ -From 0110b90cf96f902c4271a0582869f179e6833b81 Mon Sep 17 00:00:00 2001 +From e4f158e178170f969b960110ccf6ec75d088ab49 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 b41750f22..d548b27b8 100644 +index b41750f22e..d548b27b8a 100644 --- a/src/main/java/net/minecraft/server/BlockPiston.java +++ b/src/main/java/net/minecraft/server/BlockPiston.java @@ -121,7 +121,7 @@ public class BlockPiston extends BlockDirectional { diff --git a/Spigot-Server-Patches/0356-Block-Entity-remove-from-being-called-on-Players.patch b/Spigot-Server-Patches/0356-Block-Entity-remove-from-being-called-on-Players.patch index 06d7d91707..b45b19922a 100644 --- a/Spigot-Server-Patches/0356-Block-Entity-remove-from-being-called-on-Players.patch +++ b/Spigot-Server-Patches/0356-Block-Entity-remove-from-being-called-on-Players.patch @@ -1,4 +1,4 @@ -From 23dcf720508f450e79989b9279cae31020d6a63c Mon Sep 17 00:00:00 2001 +From d9cff8070d9f2ff69ac88feb508ea0c2c797c878 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 367e8cfc1..c020d0b4e 100644 +index 367e8cfc13..c020d0b4e6 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -1953,6 +1953,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player { diff --git a/Spigot-Server-Patches/0357-Allow-Saving-of-Oversized-Chunks.patch b/Spigot-Server-Patches/0357-Allow-Saving-of-Oversized-Chunks.patch index 4369c12eaa..a88fcca589 100644 --- a/Spigot-Server-Patches/0357-Allow-Saving-of-Oversized-Chunks.patch +++ b/Spigot-Server-Patches/0357-Allow-Saving-of-Oversized-Chunks.patch @@ -1,4 +1,4 @@ -From b1daf825933dfebf17b7701c40dbe983feeb35a3 Mon Sep 17 00:00:00 2001 +From 9bf4c572524d5810a1dc0251edba628e74be1fee 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 @@ -31,7 +31,7 @@ this fix, as the data will remain in the oversized file. Once the server returns to a jar with this fix, the data will be restored. diff --git a/src/main/java/net/minecraft/server/NBTCompressedStreamTools.java b/src/main/java/net/minecraft/server/NBTCompressedStreamTools.java -index 9fd8a75da..d49afd622 100644 +index 9fd8a75dae..d49afd622e 100644 --- a/src/main/java/net/minecraft/server/NBTCompressedStreamTools.java +++ b/src/main/java/net/minecraft/server/NBTCompressedStreamTools.java @@ -69,6 +69,7 @@ public class NBTCompressedStreamTools { @@ -51,7 +51,7 @@ index 9fd8a75da..d49afd622 100644 a((NBTBase) nbttagcompound, dataoutput); } diff --git a/src/main/java/net/minecraft/server/NBTTagList.java b/src/main/java/net/minecraft/server/NBTTagList.java -index b7c94fe23..80eea5dfb 100644 +index b7c94fe238..80eea5dfbd 100644 --- a/src/main/java/net/minecraft/server/NBTTagList.java +++ b/src/main/java/net/minecraft/server/NBTTagList.java @@ -11,7 +11,7 @@ import java.util.Objects; @@ -64,7 +64,7 @@ index b7c94fe23..80eea5dfb 100644 public NBTTagList() {} diff --git a/src/main/java/net/minecraft/server/RegionFile.java b/src/main/java/net/minecraft/server/RegionFile.java -index e68f90194..ed2ccebb2 100644 +index e68f901943..ed2ccebb23 100644 --- a/src/main/java/net/minecraft/server/RegionFile.java +++ b/src/main/java/net/minecraft/server/RegionFile.java @@ -23,7 +23,7 @@ public class RegionFile implements AutoCloseable { @@ -286,7 +286,7 @@ index e68f90194..ed2ccebb2 100644 + } diff --git a/src/main/java/net/minecraft/server/RegionFileCache.java b/src/main/java/net/minecraft/server/RegionFileCache.java -index 871881165..c53518a47 100644 +index 8718811655..c53518a477 100644 --- a/src/main/java/net/minecraft/server/RegionFileCache.java +++ b/src/main/java/net/minecraft/server/RegionFileCache.java @@ -47,6 +47,7 @@ public abstract class RegionFileCache implements AutoCloseable { diff --git a/Spigot-Server-Patches/0358-BlockDestroyEvent.patch b/Spigot-Server-Patches/0358-BlockDestroyEvent.patch index 740e7720d7..8cd8b72af1 100644 --- a/Spigot-Server-Patches/0358-BlockDestroyEvent.patch +++ b/Spigot-Server-Patches/0358-BlockDestroyEvent.patch @@ -1,4 +1,4 @@ -From e4e8eb871eb4c2e2ee8f9752ed648055a988f592 Mon Sep 17 00:00:00 2001 +From 4e6332dea1e906cd1261ee8d7ca68a4023bac8ea 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 f811ef8cc..032419155 100644 +index f811ef8cc8..0324191551 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -486,8 +486,20 @@ public abstract class World implements IIBlockAccess, GeneratorAccess, AutoClose diff --git a/Spigot-Server-Patches/0359-Fix-Custom-Shapeless-Custom-Crafting-Recipes.patch b/Spigot-Server-Patches/0359-Fix-Custom-Shapeless-Custom-Crafting-Recipes.patch index b24ec12fe8..b62391ac08 100644 --- a/Spigot-Server-Patches/0359-Fix-Custom-Shapeless-Custom-Crafting-Recipes.patch +++ b/Spigot-Server-Patches/0359-Fix-Custom-Shapeless-Custom-Crafting-Recipes.patch @@ -1,4 +1,4 @@ -From ae2e079ae86a1f53dafa32b8aa904e9ad7922334 Mon Sep 17 00:00:00 2001 +From 7cac26d3b6a82bc17c08efeb2a40c07bf2762814 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 070fc1e3e..691e697d6 100644 +index 070fc1e3ec..691e697d68 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 { diff --git a/Spigot-Server-Patches/0360-Fix-sign-edit-memory-leak.patch b/Spigot-Server-Patches/0360-Fix-sign-edit-memory-leak.patch index 060b4cc74e..62ff08ed38 100644 --- a/Spigot-Server-Patches/0360-Fix-sign-edit-memory-leak.patch +++ b/Spigot-Server-Patches/0360-Fix-sign-edit-memory-leak.patch @@ -1,4 +1,4 @@ -From b3f1cc3d7a9e55cc027dadfa13dcb9d98fe2b9ce Mon Sep 17 00:00:00 2001 +From 392a0cf06c56cebe30dd3efd748d8d238e70cd98 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 diff --git a/Spigot-Server-Patches/0361-Limit-Client-Sign-length-more.patch b/Spigot-Server-Patches/0361-Limit-Client-Sign-length-more.patch index 3017487ebb..acce992a82 100644 --- a/Spigot-Server-Patches/0361-Limit-Client-Sign-length-more.patch +++ b/Spigot-Server-Patches/0361-Limit-Client-Sign-length-more.patch @@ -1,4 +1,4 @@ -From 2c0aa4cedebba8a081b3185cc851674bd4b05d27 Mon Sep 17 00:00:00 2001 +From 4f72d0e754ea1627a7d0304ed4cd422ed932b821 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 diff --git a/Spigot-Server-Patches/0362-Don-t-check-ConvertSigns-boolean-every-sign-save.patch b/Spigot-Server-Patches/0362-Don-t-check-ConvertSigns-boolean-every-sign-save.patch index f46ff82380..84cf9c4752 100644 --- a/Spigot-Server-Patches/0362-Don-t-check-ConvertSigns-boolean-every-sign-save.patch +++ b/Spigot-Server-Patches/0362-Don-t-check-ConvertSigns-boolean-every-sign-save.patch @@ -1,4 +1,4 @@ -From 3be664433ed6563585bcdcf2490ef6c432f2a945 Mon Sep 17 00:00:00 2001 +From 3e9ec2ffc5ef7ece527de327f022187750b9e149 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 caeaca4c7..dd7889a4f 100644 +index caeaca4c7a..dd7889a4f9 100644 --- a/src/main/java/net/minecraft/server/TileEntitySign.java +++ b/src/main/java/net/minecraft/server/TileEntitySign.java @@ -18,6 +18,7 @@ public class TileEntitySign extends TileEntity implements ICommandListener { // diff --git a/Spigot-Server-Patches/0363-Handle-Excessive-Signs-in-Chunks-creating-too-large-.patch b/Spigot-Server-Patches/0363-Handle-Excessive-Signs-in-Chunks-creating-too-large-.patch index c3c440320f..52551d87e5 100644 --- a/Spigot-Server-Patches/0363-Handle-Excessive-Signs-in-Chunks-creating-too-large-.patch +++ b/Spigot-Server-Patches/0363-Handle-Excessive-Signs-in-Chunks-creating-too-large-.patch @@ -1,4 +1,4 @@ -From b1e2f45ae5808f32e28b0826ca14b762d34dfaaa Mon Sep 17 00:00:00 2001 +From f84a25850ddd3248c6fa8dad8a8d06612383dcf6 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 23fcdea17..ba23d2833 100644 +index 23fcdea176..ba23d28335 100644 --- a/src/main/java/net/minecraft/server/NetworkManager.java +++ b/src/main/java/net/minecraft/server/NetworkManager.java @@ -220,6 +220,15 @@ public class NetworkManager extends SimpleChannelInboundHandler> { @@ -31,7 +31,7 @@ index 23fcdea17..ba23d2833 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 2d8e6a2f4..8d0965a05 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 2d8e6a2f4..8d0965a05 100644 return false; } diff --git a/src/main/java/net/minecraft/server/PacketPlayOutMapChunk.java b/src/main/java/net/minecraft/server/PacketPlayOutMapChunk.java -index 58eccd9c6..ef71a1feb 100644 +index 58eccd9c63..ef71a1feb3 100644 --- a/src/main/java/net/minecraft/server/PacketPlayOutMapChunk.java +++ b/src/main/java/net/minecraft/server/PacketPlayOutMapChunk.java @@ -20,6 +20,15 @@ public class PacketPlayOutMapChunk implements Packet { diff --git a/Spigot-Server-Patches/0364-MC-145260-Fix-Whitelist-On-Off-inconsistency.patch b/Spigot-Server-Patches/0364-MC-145260-Fix-Whitelist-On-Off-inconsistency.patch index c146ef0612..36847a2f11 100644 --- a/Spigot-Server-Patches/0364-MC-145260-Fix-Whitelist-On-Off-inconsistency.patch +++ b/Spigot-Server-Patches/0364-MC-145260-Fix-Whitelist-On-Off-inconsistency.patch @@ -1,4 +1,4 @@ -From 5dab6532a79c382ecfe09106c4a82d9b9d48385b Mon Sep 17 00:00:00 2001 +From 5e5241742c1bb8616759fb461fff1c1672ea14de 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 8570e38f4..c97be42dd 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 8570e38f4..c97be42dd 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 0aafa1b60..eab23bd15 100644 +index 0aafa1b609..eab23bd152 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 { diff --git a/Spigot-Server-Patches/0365-Set-Zombie-last-tick-at-start-of-drowning-process.patch b/Spigot-Server-Patches/0365-Set-Zombie-last-tick-at-start-of-drowning-process.patch index 454f50b1bb..b43e0a433e 100644 --- a/Spigot-Server-Patches/0365-Set-Zombie-last-tick-at-start-of-drowning-process.patch +++ b/Spigot-Server-Patches/0365-Set-Zombie-last-tick-at-start-of-drowning-process.patch @@ -1,4 +1,4 @@ -From 25067838466eb90db0e83c92feb9cc03c7cc5406 Mon Sep 17 00:00:00 2001 +From 298689088144d793da4d057cda12f0b402cd52a9 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 b20fe8e52..40a796384 100644 +index b20fe8e521..40a796384c 100644 --- a/src/main/java/net/minecraft/server/EntityZombie.java +++ b/src/main/java/net/minecraft/server/EntityZombie.java @@ -167,6 +167,7 @@ public class EntityZombie extends EntityMonster { diff --git a/Spigot-Server-Patches/0366-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch b/Spigot-Server-Patches/0366-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch index c39750fc19..31e80ccac2 100644 --- a/Spigot-Server-Patches/0366-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch +++ b/Spigot-Server-Patches/0366-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch @@ -1,11 +1,11 @@ -From a4dc3110711450f77f0e011cdae82ee1626903df Mon Sep 17 00:00:00 2001 +From 2d2af9f8dfceb39810b50a1915f1bf0cb6d79a89 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 eab23bd15..b924f3d76 100644 +index eab23bd152..b924f3d760 100644 --- a/src/main/java/net/minecraft/server/PlayerList.java +++ b/src/main/java/net/minecraft/server/PlayerList.java @@ -1034,6 +1034,7 @@ public abstract class PlayerList { diff --git a/Spigot-Server-Patches/0367-Add-LivingEntity-getTargetEntity.patch b/Spigot-Server-Patches/0367-Add-LivingEntity-getTargetEntity.patch index b70f7fbe8f..05c995e010 100644 --- a/Spigot-Server-Patches/0367-Add-LivingEntity-getTargetEntity.patch +++ b/Spigot-Server-Patches/0367-Add-LivingEntity-getTargetEntity.patch @@ -1,11 +1,11 @@ -From cb6c2a2d3d9cf7cab2ee11970ff749eb3eef19a5 Mon Sep 17 00:00:00 2001 +From 01fc62dfa6ead6e4421d14d122e094564843579c Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Sat, 22 Sep 2018 00:33:08 -0500 Subject: [PATCH] Add LivingEntity#getTargetEntity diff --git a/src/main/java/net/minecraft/server/AxisAlignedBB.java b/src/main/java/net/minecraft/server/AxisAlignedBB.java -index 4f60b931a..c950139c0 100644 +index 4f60b931a1..c950139c0f 100644 --- a/src/main/java/net/minecraft/server/AxisAlignedBB.java +++ b/src/main/java/net/minecraft/server/AxisAlignedBB.java @@ -108,6 +108,7 @@ public class AxisAlignedBB { @@ -46,7 +46,7 @@ index 4f60b931a..c950139c0 100644 double[] adouble = new double[]{1.0D}; double d0 = vec3d1.x - vec3d.x; diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java -index 73bd0c278..6bd88e1d3 100644 +index 73bd0c278a..6bd88e1d3e 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java @@ -1447,6 +1447,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke @@ -66,7 +66,7 @@ index 73bd0c278..6bd88e1d3 100644 return 0.0F; } diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java -index 280680832..09a58fb2a 100644 +index 2806808328..09a58fb2af 100644 --- a/src/main/java/net/minecraft/server/EntityLiving.java +++ b/src/main/java/net/minecraft/server/EntityLiving.java @@ -3223,6 +3223,37 @@ public abstract class EntityLiving extends Entity { @@ -108,7 +108,7 @@ index 280680832..09a58fb2a 100644 public int getShieldBlockingDelay() { diff --git a/src/main/java/net/minecraft/server/IEntitySelector.java b/src/main/java/net/minecraft/server/IEntitySelector.java -index 9bf191945..56488b78d 100644 +index 9bf1919451..56488b78dd 100644 --- a/src/main/java/net/minecraft/server/IEntitySelector.java +++ b/src/main/java/net/minecraft/server/IEntitySelector.java @@ -18,6 +18,7 @@ public final class IEntitySelector { @@ -120,7 +120,7 @@ index 9bf191945..56488b78d 100644 return !entity.isSpectator(); }; diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java -index d5c4115a8..c4aa1945f 100644 +index d5c4115a85..c4aa1945ff 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java @@ -202,6 +202,33 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity { diff --git a/Spigot-Server-Patches/0368-Use-proper-max-length-when-serialising-BungeeCord-te.patch b/Spigot-Server-Patches/0368-Use-proper-max-length-when-serialising-BungeeCord-te.patch index ea5e408c5a..b07c7bf3c9 100644 --- a/Spigot-Server-Patches/0368-Use-proper-max-length-when-serialising-BungeeCord-te.patch +++ b/Spigot-Server-Patches/0368-Use-proper-max-length-when-serialising-BungeeCord-te.patch @@ -1,4 +1,4 @@ -From a5108a8422e787acd77cfeae3ab2d712ca23b930 Mon Sep 17 00:00:00 2001 +From 68857a81b32d331bc7a239869d9ea47bfd8bc4cc 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 0ab611564..f7b2095bb 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; diff --git a/Spigot-Server-Patches/0369-Entity-getEntitySpawnReason.patch b/Spigot-Server-Patches/0369-Entity-getEntitySpawnReason.patch index 511aa90203..df0e320164 100644 --- a/Spigot-Server-Patches/0369-Entity-getEntitySpawnReason.patch +++ b/Spigot-Server-Patches/0369-Entity-getEntitySpawnReason.patch @@ -1,4 +1,4 @@ -From 519d8ed327b08e12b413014380e019873e5e7d2f Mon Sep 17 00:00:00 2001 +From a29735b84ec7df89ea61982edcee7d3f20058377 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sun, 24 Mar 2019 00:24:52 -0400 Subject: [PATCH] Entity#getEntitySpawnReason @@ -10,7 +10,7 @@ persistenting Living Entity, SPAWNER for spawners, or DEFAULT since data was not stored. diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java -index 6dae950c2..5711cf664 100644 +index 6bd88e1d3e..658c493cd3 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java @@ -68,6 +68,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke @@ -59,7 +59,7 @@ index 6dae950c2..5711cf664 100644 } catch (Throwable throwable) { diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java -index b924f3d76..95f309342 100644 +index b924f3d760..95f3093423 100644 --- a/src/main/java/net/minecraft/server/PlayerList.java +++ b/src/main/java/net/minecraft/server/PlayerList.java @@ -250,7 +250,7 @@ public abstract class PlayerList { @@ -72,7 +72,7 @@ index b924f3d76..95f309342 100644 }); diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java -index 3c986857b..c93bf8e8b 100644 +index 3c986857b2..c93bf8e8b5 100644 --- a/src/main/java/net/minecraft/server/WorldServer.java +++ b/src/main/java/net/minecraft/server/WorldServer.java @@ -932,6 +932,7 @@ public class WorldServer extends World { @@ -84,7 +84,7 @@ index 3c986857b..c93bf8e8b 100644 if (entity.dead) { // Paper start diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java -index 1cd3448e5..15042943c 100644 +index 1cd3448e57..15042943c9 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java @@ -1053,5 +1053,10 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity { diff --git a/Spigot-Server-Patches/0370-Update-entity-Metadata-for-all-tracked-players.patch b/Spigot-Server-Patches/0370-Update-entity-Metadata-for-all-tracked-players.patch index 3a9ee57c01..82621a836e 100644 --- a/Spigot-Server-Patches/0370-Update-entity-Metadata-for-all-tracked-players.patch +++ b/Spigot-Server-Patches/0370-Update-entity-Metadata-for-all-tracked-players.patch @@ -1,4 +1,4 @@ -From d7985327c60ac20d865d6ba5e8923fe8b0811438 Mon Sep 17 00:00:00 2001 +From 1561f1be29adc121528fa14599f17942189ddfb3 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/0371-Fire-event-on-GS4-query.patch b/Spigot-Server-Patches/0371-Fire-event-on-GS4-query.patch index 11278003ea..e3a5ab7e94 100644 --- a/Spigot-Server-Patches/0371-Fire-event-on-GS4-query.patch +++ b/Spigot-Server-Patches/0371-Fire-event-on-GS4-query.patch @@ -1,11 +1,11 @@ -From e7c9501ecb2e65a95f8a81b3e6dd69b1a9180d97 Mon Sep 17 00:00:00 2001 +From c1f9e47b60affb92f04f50a580d695187759fe8a 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 66bfbcf02..d821ef9a7 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 66bfbcf02..d821ef9a7 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 a556a7133..67e94a6f0 100644 +index a556a71334..67e94a6f07 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 a556a7133..67e94a6f0 100644 } } diff --git a/src/main/java/net/minecraft/server/RemoteStatusReply.java b/src/main/java/net/minecraft/server/RemoteStatusReply.java -index 848b5c3f0..73efea7e1 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 { diff --git a/Spigot-Server-Patches/0372-Implement-PlayerPostRespawnEvent.patch b/Spigot-Server-Patches/0372-Implement-PlayerPostRespawnEvent.patch index 557b0cdfc0..7bf3097f0a 100644 --- a/Spigot-Server-Patches/0372-Implement-PlayerPostRespawnEvent.patch +++ b/Spigot-Server-Patches/0372-Implement-PlayerPostRespawnEvent.patch @@ -1,11 +1,11 @@ -From 3dc625efd1910582b72e02915aa73aaeb4f0195f Mon Sep 17 00:00:00 2001 +From 44b5662872e7051d4c28df8b0d3bc4f9d029b0f9 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 95f309342..47789ee6b 100644 +index 95f3093423..47789ee6b0 100644 --- a/src/main/java/net/minecraft/server/PlayerList.java +++ b/src/main/java/net/minecraft/server/PlayerList.java @@ -637,9 +637,14 @@ public abstract class PlayerList { diff --git a/Spigot-Server-Patches/0373-don-t-go-below-0-for-pickupDelay-breaks-picking-up-i.patch b/Spigot-Server-Patches/0373-don-t-go-below-0-for-pickupDelay-breaks-picking-up-i.patch index 9c4e40e767..052f998f76 100644 --- a/Spigot-Server-Patches/0373-don-t-go-below-0-for-pickupDelay-breaks-picking-up-i.patch +++ b/Spigot-Server-Patches/0373-don-t-go-below-0-for-pickupDelay-breaks-picking-up-i.patch @@ -1,4 +1,4 @@ -From fad0f9f59721daf38bb68aecb6465588b25ccf06 Mon Sep 17 00:00:00 2001 +From f5f12b3f70ca4e261e1c1c500ee53664621ec0e2 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 ddd1f6307..7e9256314 100644 +index ddd1f63073..7e92563141 100644 --- a/src/main/java/net/minecraft/server/EntityItem.java +++ b/src/main/java/net/minecraft/server/EntityItem.java @@ -59,6 +59,7 @@ public class EntityItem extends Entity { diff --git a/Spigot-Server-Patches/0374-Implement-getters-and-setters-for-EntityItem-owner-a.patch b/Spigot-Server-Patches/0374-Implement-getters-and-setters-for-EntityItem-owner-a.patch index ed186a10d9..63db33b783 100644 --- a/Spigot-Server-Patches/0374-Implement-getters-and-setters-for-EntityItem-owner-a.patch +++ b/Spigot-Server-Patches/0374-Implement-getters-and-setters-for-EntityItem-owner-a.patch @@ -1,4 +1,4 @@ -From dbae2d53e2473ee7c84499f409faf51096829527 Mon Sep 17 00:00:00 2001 +From 7ec94c6c631557e997df9957b359a63da930f10c 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 3f552b590..cb756b1ba 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; diff --git a/Spigot-Server-Patches/0375-Server-Tick-Events.patch b/Spigot-Server-Patches/0375-Server-Tick-Events.patch index ea4883484d..b070bef722 100644 --- a/Spigot-Server-Patches/0375-Server-Tick-Events.patch +++ b/Spigot-Server-Patches/0375-Server-Tick-Events.patch @@ -1,4 +1,4 @@ -From 5ceffba14f8451560d802a47305c50d9a1912696 Mon Sep 17 00:00:00 2001 +From d8978d96afe0605178d34fd5dc1898c3c8b6dd4e Mon Sep 17 00:00:00 2001 From: Aikar Date: Wed, 27 Mar 2019 22:48:45 -0400 Subject: [PATCH] Server Tick Events @@ -6,7 +6,7 @@ Subject: [PATCH] Server Tick Events Fires event at start and end of a server tick diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 99306781f..cbb428063 100644 +index 99306781f7..cbb4280631 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -1041,6 +1041,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant Date: Wed, 27 Mar 2019 23:01:33 -0400 Subject: [PATCH] PlayerDeathEvent#getItemsToKeep @@ -8,7 +8,7 @@ Exposes a mutable array on items a player should keep on death Example Usage: https://gist.github.com/aikar/5bb202de6057a051a950ce1f29feb0b4 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java -index 0a67f48f6..691a2d094 100644 +index 0a67f48f66..691a2d094d 100644 --- a/src/main/java/net/minecraft/server/EntityPlayer.java +++ b/src/main/java/net/minecraft/server/EntityPlayer.java @@ -508,6 +508,46 @@ public class EntityPlayer extends EntityHuman implements ICrafting { diff --git a/Spigot-Server-Patches/0377-Optimize-Persistent-Data-Loading.patch b/Spigot-Server-Patches/0377-Optimize-Persistent-Data-Loading.patch index e44bc5fc9e..52f7cb97f4 100644 --- a/Spigot-Server-Patches/0377-Optimize-Persistent-Data-Loading.patch +++ b/Spigot-Server-Patches/0377-Optimize-Persistent-Data-Loading.patch @@ -1,4 +1,4 @@ -From e1ed8abcbc9786fcffb960f9f44426bffe13d9f6 Mon Sep 17 00:00:00 2001 +From 98a623255c3d8a4990dd4d269ef41cc42cedc204 Mon Sep 17 00:00:00 2001 From: Aikar Date: Fri, 29 Mar 2019 01:25:11 -0400 Subject: [PATCH] Optimize Persistent Data Loading @@ -14,7 +14,7 @@ These files take a long time to convert on large worlds and crashes the server. Additionally, cache the result of a file being missing so we don't keep spam checking it. diff --git a/src/main/java/net/minecraft/server/WorldPersistentData.java b/src/main/java/net/minecraft/server/WorldPersistentData.java -index 47a4ea998..62081349f 100644 +index 47a4ea9985..62081349f1 100644 --- a/src/main/java/net/minecraft/server/WorldPersistentData.java +++ b/src/main/java/net/minecraft/server/WorldPersistentData.java @@ -26,6 +26,7 @@ public class WorldPersistentData { diff --git a/Spigot-Server-Patches/0378-Allow-login-events-to-fire-only-after-the-server-plu.patch b/Spigot-Server-Patches/0378-Allow-login-events-to-fire-only-after-the-server-plu.patch index 465c29985a..bc30f64ac3 100644 --- a/Spigot-Server-Patches/0378-Allow-login-events-to-fire-only-after-the-server-plu.patch +++ b/Spigot-Server-Patches/0378-Allow-login-events-to-fire-only-after-the-server-plu.patch @@ -1,4 +1,4 @@ -From ef1a2041f4c43bb39e7b7035fb3a14863da5ccf2 Mon Sep 17 00:00:00 2001 +From c4ebf33bd6863122ff5a3206d7c04096d30f6a6f Mon Sep 17 00:00:00 2001 From: Spottedleaf Date: Sun, 31 Mar 2019 22:02:24 -0700 Subject: [PATCH] Allow login events to fire only after the server plugins are @@ -7,7 +7,7 @@ Subject: [PATCH] Allow login events to fire only after the server plugins are Event threads will simply block until they're ready to accept. diff --git a/src/main/java/net/minecraft/server/LoginListener.java b/src/main/java/net/minecraft/server/LoginListener.java -index 9e4bc2405..028c23dbe 100644 +index 9e4bc24058..028c23dbe6 100644 --- a/src/main/java/net/minecraft/server/LoginListener.java +++ b/src/main/java/net/minecraft/server/LoginListener.java @@ -285,6 +285,36 @@ public class LoginListener implements PacketLoginInListener { @@ -56,7 +56,7 @@ index 9e4bc2405..028c23dbe 100644 java.net.InetAddress address = ((java.net.InetSocketAddress) networkManager.getSocketAddress()).getAddress(); java.util.UUID uniqueId = i.getId(); diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index cbb428063..ba68d7f83 100644 +index cbb4280631..ba68d7f833 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -462,6 +462,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant Date: Mon, 1 Apr 2019 18:57:32 -0700 Subject: [PATCH] Make region files more reliable to write to @@ -37,7 +37,7 @@ affect save performance if the startup flag is used (especially on HDDs). diff --git a/src/main/java/net/minecraft/server/RegionFile.java b/src/main/java/net/minecraft/server/RegionFile.java -index ed2ccebb2..2e14d8465 100644 +index ed2ccebb23..2e14d84657 100644 --- a/src/main/java/net/minecraft/server/RegionFile.java +++ b/src/main/java/net/minecraft/server/RegionFile.java @@ -29,7 +29,7 @@ public class RegionFile implements AutoCloseable { diff --git a/Spigot-Server-Patches/0380-Optimize-GameRules-to-use-LinkedHashMap.patch b/Spigot-Server-Patches/0380-Optimize-GameRules-to-use-LinkedHashMap.patch index 301d4632bd..110d110505 100644 --- a/Spigot-Server-Patches/0380-Optimize-GameRules-to-use-LinkedHashMap.patch +++ b/Spigot-Server-Patches/0380-Optimize-GameRules-to-use-LinkedHashMap.patch @@ -1,4 +1,4 @@ -From f5c04bb8f4496e6409dd1f60edd7fd2e1bd38abd Mon Sep 17 00:00:00 2001 +From 6f90cca3b78f2a8b7699572998b0fbbd1dc76ec5 Mon Sep 17 00:00:00 2001 From: Spottedleaf Date: Thu, 4 Apr 2019 17:55:05 -0700 Subject: [PATCH] Optimize GameRules to use LinkedHashMap @@ -6,7 +6,7 @@ Subject: [PATCH] Optimize GameRules to use LinkedHashMap Previously TreeMap was used which has poor get(K) performance. diff --git a/src/main/java/net/minecraft/server/GameRules.java b/src/main/java/net/minecraft/server/GameRules.java -index 3de9d264d..c6a800474 100644 +index 3de9d264db..c6a8004745 100644 --- a/src/main/java/net/minecraft/server/GameRules.java +++ b/src/main/java/net/minecraft/server/GameRules.java @@ -17,7 +17,17 @@ import javax.annotation.Nullable; @@ -49,7 +49,7 @@ index 3de9d264d..c6a800474 100644 } diff --git a/src/test/java/org/bukkit/GameRuleTest.java b/src/test/java/org/bukkit/GameRuleTest.java -index 1ed0f4cf2..40edb8d66 100644 +index 1ed0f4cf2b..40edb8d668 100644 --- a/src/test/java/org/bukkit/GameRuleTest.java +++ b/src/test/java/org/bukkit/GameRuleTest.java @@ -21,7 +21,7 @@ public class GameRuleTest { diff --git a/Spigot-Server-Patches/0381-Optimize-Captured-TileEntity-Lookup.patch b/Spigot-Server-Patches/0381-Optimize-Captured-TileEntity-Lookup.patch index 888829297b..4486ed8410 100644 --- a/Spigot-Server-Patches/0381-Optimize-Captured-TileEntity-Lookup.patch +++ b/Spigot-Server-Patches/0381-Optimize-Captured-TileEntity-Lookup.patch @@ -1,4 +1,4 @@ -From 33beaa1f1eca62c989c590808b99c55ea0b61944 Mon Sep 17 00:00:00 2001 +From 23f3d0db1d1c00b42cd80431fafacc551af8056a 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 032419155..177ea8f4c 100644 +index 0324191551..177ea8f4cd 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -1049,12 +1049,13 @@ public abstract class World implements IIBlockAccess, GeneratorAccess, AutoClose diff --git a/Spigot-Server-Patches/0382-Add-Heightmap-API.patch b/Spigot-Server-Patches/0382-Add-Heightmap-API.patch index e06eb2b909..66a64e70ee 100644 --- a/Spigot-Server-Patches/0382-Add-Heightmap-API.patch +++ b/Spigot-Server-Patches/0382-Add-Heightmap-API.patch @@ -1,11 +1,11 @@ -From 755a168f7205e572a96c24a9f3c6838d9934d5c0 Mon Sep 17 00:00:00 2001 +From e26b52705a78ba126636037a2dcce82441872159 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 177ea8f4c..a12964f90 100644 +index 177ea8f4cd..a12964f904 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -625,8 +625,8 @@ public abstract class World implements IIBlockAccess, GeneratorAccess, AutoClose @@ -20,7 +20,7 @@ index 177ea8f4c..a12964f90 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 3ebea9693..2c6a42d92 100644 +index f4afddba4d..fa4142c824 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java @@ -317,6 +317,29 @@ public class CraftWorld implements World { diff --git a/Spigot-Server-Patches/0383-Handle-bad-chunks-more-gracefully.patch b/Spigot-Server-Patches/0383-Handle-bad-chunks-more-gracefully.patch index a5a7ae52b5..cbda5a8b6a 100644 --- a/Spigot-Server-Patches/0383-Handle-bad-chunks-more-gracefully.patch +++ b/Spigot-Server-Patches/0383-Handle-bad-chunks-more-gracefully.patch @@ -1,4 +1,4 @@ -From 6cc9dca44a2a2be130d0382b38f35f4de8109f7f Mon Sep 17 00:00:00 2001 +From 66ac6e96f4a6582a2be7921f259e91a0e825b509 Mon Sep 17 00:00:00 2001 From: Shane Freeder Date: Mon, 15 Apr 2019 02:24:52 +0100 Subject: [PATCH] Handle bad chunks more gracefully @@ -15,7 +15,7 @@ Should Mojang choose to alter this behavior in the future, this change will simply defer to whatever that new behavior is. diff --git a/src/main/java/net/minecraft/server/RegionFileCache.java b/src/main/java/net/minecraft/server/RegionFileCache.java -index c53518a47..6f34d8aea 100644 +index c53518a477..6f34d8aea0 100644 --- a/src/main/java/net/minecraft/server/RegionFileCache.java +++ b/src/main/java/net/minecraft/server/RegionFileCache.java @@ -171,8 +171,21 @@ public abstract class RegionFileCache implements AutoCloseable { diff --git a/Spigot-Server-Patches/0384-Mob-Spawner-API-Enhancements.patch b/Spigot-Server-Patches/0384-Mob-Spawner-API-Enhancements.patch index 874e2c4c1c..eeb4e24bd0 100644 --- a/Spigot-Server-Patches/0384-Mob-Spawner-API-Enhancements.patch +++ b/Spigot-Server-Patches/0384-Mob-Spawner-API-Enhancements.patch @@ -1,11 +1,11 @@ -From 92a8dc4e7db90a9acd20ad38dda4099a34879bbe Mon Sep 17 00:00:00 2001 +From 157c419883a53d17f7b28f018802c723e1938eea 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 dbb8098d6..e9bcb5aba 100644 +index dbb8098d6c..e9bcb5abaa 100644 --- a/src/main/java/net/minecraft/server/MobSpawnerAbstract.java +++ b/src/main/java/net/minecraft/server/MobSpawnerAbstract.java @@ -46,6 +46,7 @@ public abstract class MobSpawnerAbstract { @@ -82,7 +82,7 @@ index dbb8098d6..e9bcb5aba 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 5c4c3c70c..e78e3804b 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 2b39115c9..a248f63f1 100644 +index 9b2ac3c63a..29fa1d1df1 100644 --- a/src/main/java/net/minecraft/server/EntityEnderDragon.java +++ b/src/main/java/net/minecraft/server/EntityEnderDragon.java @@ -570,9 +570,9 @@ public class EntityEnderDragon extends EntityInsentient implements IMonster { @@ -23,7 +23,7 @@ index 2b39115c9..a248f63f1 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 e3feb39ad..5609fcfe0 100644 +index e3feb39ad0..5609fcfe00 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 e3feb39ad..5609fcfe0 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 c020d0b4e..9f267414d 100644 +index c020d0b4e6..9f267414da 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -1962,6 +1962,16 @@ public class CraftPlayer extends CraftHumanEntity implements Player { diff --git a/Spigot-Server-Patches/0386-Async-Chunk-placeholder.patch b/Spigot-Server-Patches/0386-Async-Chunk-placeholder.patch index 38a8d1797a..d9354b26fd 100644 --- a/Spigot-Server-Patches/0386-Async-Chunk-placeholder.patch +++ b/Spigot-Server-Patches/0386-Async-Chunk-placeholder.patch @@ -1,4 +1,4 @@ -From 48e095c9022c5b4cec520ed144dff31443494f12 Mon Sep 17 00:00:00 2001 +From 2efa59acece191836a29be8d5b9160ba1e34723e Mon Sep 17 00:00:00 2001 From: Spottedleaf Date: Mon, 6 May 2019 12:29:24 -0700 Subject: [PATCH] Async Chunk placeholder @@ -6,7 +6,7 @@ Subject: [PATCH] Async Chunk placeholder Until we figure out Mojang's ticket system. diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -index 2c6a42d92..63f953617 100644 +index fa4142c824..0328eadf27 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java @@ -14,6 +14,7 @@ import java.util.Objects; diff --git a/Spigot-Server-Patches/0387-Fix-CB-call-to-changed-postToMainThread-method.patch b/Spigot-Server-Patches/0387-Fix-CB-call-to-changed-postToMainThread-method.patch index 3db1e7618d..4951437146 100644 --- a/Spigot-Server-Patches/0387-Fix-CB-call-to-changed-postToMainThread-method.patch +++ b/Spigot-Server-Patches/0387-Fix-CB-call-to-changed-postToMainThread-method.patch @@ -1,11 +1,11 @@ -From 48110a346d4469552122af301007a9ff22d190e4 Mon Sep 17 00:00:00 2001 +From 2ca69a7a86be4c5b627f3f5e544938e9658ef585 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 f3f6fa1c4..01c268a58 100644 +index 4e8b8f49c4..a0b644801a 100644 --- a/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java @@ -282,7 +282,7 @@ public class PlayerConnection implements PacketListenerPlayIn { diff --git a/Spigot-Server-Patches/0388-Fix-sounds-when-item-frames-are-modified-MC-123450.patch b/Spigot-Server-Patches/0388-Fix-sounds-when-item-frames-are-modified-MC-123450.patch index eb1acb19f6..a527f0165e 100644 --- a/Spigot-Server-Patches/0388-Fix-sounds-when-item-frames-are-modified-MC-123450.patch +++ b/Spigot-Server-Patches/0388-Fix-sounds-when-item-frames-are-modified-MC-123450.patch @@ -1,4 +1,4 @@ -From 36d1b06a6145bb3141af2e925f7b0c713a95acd2 Mon Sep 17 00:00:00 2001 +From 08291096077e04bb02461271048ebead11598705 Mon Sep 17 00:00:00 2001 From: Phoenix616 Date: Sat, 27 Apr 2019 20:00:43 +0100 Subject: [PATCH] Fix sounds when item frames are modified (MC-123450) @@ -6,7 +6,7 @@ Subject: [PATCH] Fix sounds when item frames are modified (MC-123450) This also fixes the adding sound playing when the item frame direction is changed. diff --git a/src/main/java/net/minecraft/server/EntityItemFrame.java b/src/main/java/net/minecraft/server/EntityItemFrame.java -index 3ecdd00a1..aac28bfa3 100644 +index 3ecdd00a12..aac28bfa32 100644 --- a/src/main/java/net/minecraft/server/EntityItemFrame.java +++ b/src/main/java/net/minecraft/server/EntityItemFrame.java @@ -211,7 +211,7 @@ public class EntityItemFrame extends EntityHanging { @@ -19,7 +19,7 @@ index 3ecdd00a1..aac28bfa3 100644 } diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftItemFrame.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftItemFrame.java -index 70127520a..712ec431f 100644 +index 70127520a2..712ec431f0 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftItemFrame.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftItemFrame.java @@ -49,7 +49,7 @@ public class CraftItemFrame extends CraftHanging implements ItemFrame { diff --git a/Spigot-Server-Patches/0389-Fix-CraftServer-isPrimaryThread-and-MinecraftServer-.patch b/Spigot-Server-Patches/0389-Fix-CraftServer-isPrimaryThread-and-MinecraftServer-.patch index 65301e1f87..4310f16774 100644 --- a/Spigot-Server-Patches/0389-Fix-CraftServer-isPrimaryThread-and-MinecraftServer-.patch +++ b/Spigot-Server-Patches/0389-Fix-CraftServer-isPrimaryThread-and-MinecraftServer-.patch @@ -1,4 +1,4 @@ -From 88ca104557986c026650d02697b9cf3edc962258 Mon Sep 17 00:00:00 2001 +From f8b92c164facc348c7e858b5f79436b3fe775f8c Mon Sep 17 00:00:00 2001 From: Spottedleaf Date: Mon, 13 May 2019 21:10:59 -0700 Subject: [PATCH] Fix CraftServer#isPrimaryThread and MinecraftServer @@ -16,7 +16,7 @@ handling that should have been handled synchronously will be handled synchronously when the server gets shut down. diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index ba68d7f83..f1cd38d42 100644 +index ba68d7f833..f1cd38d421 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -1936,7 +1936,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant Date: Sat, 11 May 2019 08:19:27 -0700 Subject: [PATCH] Elide lock in DataWatcher @@ -17,7 +17,7 @@ of the Entity, the further readlocks are actually useless (which get obtained on set, get, etc calls). diff --git a/src/main/java/net/minecraft/server/DataWatcher.java b/src/main/java/net/minecraft/server/DataWatcher.java -index f224043d8..bbea8ef72 100644 +index f224043d8e..bbea8ef726 100644 --- a/src/main/java/net/minecraft/server/DataWatcher.java +++ b/src/main/java/net/minecraft/server/DataWatcher.java @@ -23,7 +23,7 @@ public class DataWatcher { diff --git a/Spigot-Server-Patches/0391-Fix-issues-with-entity-loss-due-to-unloaded-chunks.patch b/Spigot-Server-Patches/0391-Fix-issues-with-entity-loss-due-to-unloaded-chunks.patch index 344115803b..ed579bcfeb 100644 --- a/Spigot-Server-Patches/0391-Fix-issues-with-entity-loss-due-to-unloaded-chunks.patch +++ b/Spigot-Server-Patches/0391-Fix-issues-with-entity-loss-due-to-unloaded-chunks.patch @@ -1,4 +1,4 @@ -From 152cb5909a0fb8881db4fac8b71478dada93e1f9 Mon Sep 17 00:00:00 2001 +From 8db9c6baf4120b008fc84ab745a597b65737429e 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 c93bf8e8b..e61381221 100644 +index c93bf8e8b5..e61381221f 100644 --- a/src/main/java/net/minecraft/server/WorldServer.java +++ b/src/main/java/net/minecraft/server/WorldServer.java @@ -635,7 +635,7 @@ public class WorldServer extends World { diff --git a/Spigot-Server-Patches/0392-Duplicate-UUID-Resolve-Option.patch b/Spigot-Server-Patches/0392-Duplicate-UUID-Resolve-Option.patch index 66e86fe4c0..bf3fcc682a 100644 --- a/Spigot-Server-Patches/0392-Duplicate-UUID-Resolve-Option.patch +++ b/Spigot-Server-Patches/0392-Duplicate-UUID-Resolve-Option.patch @@ -1,4 +1,4 @@ -From 5e0eb7ee9051bfaa6998a4393b0e59ef349662c5 Mon Sep 17 00:00:00 2001 +From 47b5ce24208abd7b5183624b2581bca5de26aad5 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sat, 21 Jul 2018 14:27:34 -0400 Subject: [PATCH] Duplicate UUID Resolve Option @@ -93,7 +93,7 @@ index 197c0fe169..ef07f665b7 100644 int k = MathHelper.floor(entity.locY / 16.0D); diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java -index 50c52118b8..5fa0dc8ac5 100644 +index 658c493cd3..fae57a0998 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java @@ -2674,6 +2674,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke @@ -105,7 +105,7 @@ index 50c52118b8..5fa0dc8ac5 100644 this.uniqueID = uuid; this.ap = this.uniqueID.toString(); diff --git a/src/main/java/net/minecraft/server/PlayerChunkMap.java b/src/main/java/net/minecraft/server/PlayerChunkMap.java -index 446bdb0216..276a365ff5 100644 +index 7bdf0e2d67..21f527d99d 100644 --- a/src/main/java/net/minecraft/server/PlayerChunkMap.java +++ b/src/main/java/net/minecraft/server/PlayerChunkMap.java @@ -1,5 +1,6 @@ diff --git a/Spigot-Server-Patches/0393-improve-CraftWorld-isChunkLoaded.patch b/Spigot-Server-Patches/0393-improve-CraftWorld-isChunkLoaded.patch index d7e473ef84..a57ea54a2a 100644 --- a/Spigot-Server-Patches/0393-improve-CraftWorld-isChunkLoaded.patch +++ b/Spigot-Server-Patches/0393-improve-CraftWorld-isChunkLoaded.patch @@ -1,4 +1,4 @@ -From 03eda436935de6ad94031a531ac8581efcd7f50e Mon Sep 17 00:00:00 2001 +From c64f25a169f864c9423a75e2f52ca16b9ea1c64b 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 63f953617..c0207694a 100644 +index 0328eadf27..7b17a634c2 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java @@ -382,8 +382,7 @@ public class CraftWorld implements World { diff --git a/Spigot-Server-Patches/0394-Configurable-Keep-Spawn-Loaded-range-per-world.patch b/Spigot-Server-Patches/0394-Configurable-Keep-Spawn-Loaded-range-per-world.patch index e88966288e..0eadbec46d 100644 --- a/Spigot-Server-Patches/0394-Configurable-Keep-Spawn-Loaded-range-per-world.patch +++ b/Spigot-Server-Patches/0394-Configurable-Keep-Spawn-Loaded-range-per-world.patch @@ -1,4 +1,4 @@ -From 791552cb7752b4724a1b27e004a6a3c4e300ca54 Mon Sep 17 00:00:00 2001 +From e7f166fd8af18e6b9863722bc7afe021fba47bf7 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 @@ -6,7 +6,7 @@ Subject: [PATCH] Configurable Keep Spawn Loaded range per world This lets you disable it for some worlds and lower it for others. diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index 385b3ac0c..b85406198 100644 +index 385b3ac0ce..b854061983 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java @@ -488,4 +488,10 @@ public class PaperWorldConfig { @@ -21,7 +21,7 @@ index 385b3ac0c..b85406198 100644 + } } diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index f1cd38d42..184f1b00f 100644 +index f1cd38d421..184f1b00f0 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -570,6 +570,13 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant Date: Fri, 24 May 2019 07:53:16 +0100 Subject: [PATCH] Fix some generation concurrency issues diff --git a/src/main/java/net/minecraft/server/DefinedStructureManager.java b/src/main/java/net/minecraft/server/DefinedStructureManager.java -index 6aa0ca395..ed9b5c63f 100644 +index 6aa0ca3959..ed9b5c63f0 100644 --- a/src/main/java/net/minecraft/server/DefinedStructureManager.java +++ b/src/main/java/net/minecraft/server/DefinedStructureManager.java @@ -20,7 +20,7 @@ import org.apache.logging.log4j.Logger; @@ -18,7 +18,7 @@ index 6aa0ca395..ed9b5c63f 100644 private final MinecraftServer d; private final java.nio.file.Path e; diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index a12964f90..7e01731f6 100644 +index a12964f904..7e01731f64 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -101,6 +101,23 @@ public abstract class World implements IIBlockAccess, GeneratorAccess, AutoClose @@ -46,7 +46,7 @@ index a12964f90..7e01731f6 100644 public CraftWorld getWorld() { return this.world; diff --git a/src/main/java/net/minecraft/server/WorldGenStronghold.java b/src/main/java/net/minecraft/server/WorldGenStronghold.java -index eca27e52e..fb3463fcc 100644 +index eca27e52e9..fb3463fcce 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; diff --git a/Spigot-Server-Patches/0396-MC-114618-Fix-EntityAreaEffectCloud-from-going-negat.patch b/Spigot-Server-Patches/0396-MC-114618-Fix-EntityAreaEffectCloud-from-going-negat.patch index db4140e473..2f8a6a9901 100644 --- a/Spigot-Server-Patches/0396-MC-114618-Fix-EntityAreaEffectCloud-from-going-negat.patch +++ b/Spigot-Server-Patches/0396-MC-114618-Fix-EntityAreaEffectCloud-from-going-negat.patch @@ -1,4 +1,4 @@ -From e8460ab0ab74b393a0d2e6ef99953ef6da5372c3 Mon Sep 17 00:00:00 2001 +From c051c75ea0d65ca5671c2b0c1ecde776e9fcb2f3 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 418c638d3..2eaed1cd6 100644 +index 418c638d31..2eaed1cd63 100644 --- a/src/main/java/net/minecraft/server/EntityAreaEffectCloud.java +++ b/src/main/java/net/minecraft/server/EntityAreaEffectCloud.java @@ -163,6 +163,12 @@ public class EntityAreaEffectCloud extends Entity { diff --git a/Spigot-Server-Patches/0397-ChunkMapDistance-CME.patch b/Spigot-Server-Patches/0397-ChunkMapDistance-CME.patch index 59c7b94299..1761353376 100644 --- a/Spigot-Server-Patches/0397-ChunkMapDistance-CME.patch +++ b/Spigot-Server-Patches/0397-ChunkMapDistance-CME.patch @@ -1,11 +1,11 @@ -From c9ebde9228cf948c411658c987ddeced08df3cb8 Mon Sep 17 00:00:00 2001 +From c74969845263459f4f12c12766fcfaffa6d7522b 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 ba4b9fa59..d3c2ad3c4 100644 +index ba4b9fa59c..d3c2ad3c40 100644 --- a/src/main/java/net/minecraft/server/ChunkMapDistance.java +++ b/src/main/java/net/minecraft/server/ChunkMapDistance.java @@ -39,7 +39,7 @@ public abstract class ChunkMapDistance { diff --git a/Spigot-Server-Patches/0398-Implement-CraftBlockSoundGroup.patch b/Spigot-Server-Patches/0398-Implement-CraftBlockSoundGroup.patch index f2b75bd2e7..431260b6ea 100644 --- a/Spigot-Server-Patches/0398-Implement-CraftBlockSoundGroup.patch +++ b/Spigot-Server-Patches/0398-Implement-CraftBlockSoundGroup.patch @@ -1,4 +1,4 @@ -From cbc0ab008f6a703a9c49e518efee9a45541c535c Mon Sep 17 00:00:00 2001 +From f8144a7748f6f75e131a41175cab2290f9d5726b 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/0399-Chunk-debug-command.patch b/Spigot-Server-Patches/0399-Chunk-debug-command.patch index fb92fcf7b9..b82d604d2c 100644 --- a/Spigot-Server-Patches/0399-Chunk-debug-command.patch +++ b/Spigot-Server-Patches/0399-Chunk-debug-command.patch @@ -1,4 +1,4 @@ -From ffe3cb42d4aefedfb6d179f1208ab22d61a8588e Mon Sep 17 00:00:00 2001 +From f939bbb2d0d67fc1a7ba5c1e05c553fd79bd090c Mon Sep 17 00:00:00 2001 From: Spottedleaf Date: Sat, 1 Jun 2019 13:00:55 -0700 Subject: [PATCH] Chunk debug command @@ -127,7 +127,7 @@ index d3c2ad3c40..705ca68798 100644 private final ChunkMapDistance.c g = new ChunkMapDistance.c(); private int entitydistance; diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java -index 0e941b520f..a6a9f1923f 100644 +index 769794ad47..086d4a1a16 100644 --- a/src/main/java/net/minecraft/server/ChunkProviderServer.java +++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java @@ -23,7 +23,7 @@ import org.apache.logging.log4j.Logger; @@ -354,7 +354,7 @@ index 0d8cddeb62..22739ad8a1 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 276a365ff5..ef921005c5 100644 +index 21f527d99d..c091007d8c 100644 --- a/src/main/java/net/minecraft/server/PlayerChunkMap.java +++ b/src/main/java/net/minecraft/server/PlayerChunkMap.java @@ -53,7 +53,7 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d { diff --git a/work/CraftBukkit b/work/CraftBukkit index 043d31deb0..17543ecfd4 160000 --- a/work/CraftBukkit +++ b/work/CraftBukkit @@ -1 +1 @@ -Subproject commit 043d31deb089054e8a59477c2aa496e322f66156 +Subproject commit 17543ecfd47fab67955aa3913423d769796de368