diff options
20 files changed, 51 insertions, 16 deletions
diff --git a/patches/api/0054-Fix-upstream-javadocs.patch b/patches/api/0054-Fix-upstream-javadocs.patch index dd7aa76182..1ee6c866ce 100644 --- a/patches/api/0054-Fix-upstream-javadocs.patch +++ b/patches/api/0054-Fix-upstream-javadocs.patch @@ -187,6 +187,41 @@ index d51d2ec1d04d9ea8a25a70d0d856f2355ebfcb4a..7ecff9fcee19fc94be784474fea620e5 */ EATING, /** +diff --git a/src/main/java/org/bukkit/event/player/PlayerArmorStandManipulateEvent.java b/src/main/java/org/bukkit/event/player/PlayerArmorStandManipulateEvent.java +index f72dd3ccf09c024213548e59ee1c13ca2cf48808..2f54cb77c991211e0e4b9fa37dc64888804a2a07 100644 +--- a/src/main/java/org/bukkit/event/player/PlayerArmorStandManipulateEvent.java ++++ b/src/main/java/org/bukkit/event/player/PlayerArmorStandManipulateEvent.java +@@ -26,11 +26,11 @@ public class PlayerArmorStandManipulateEvent extends PlayerInteractEntityEvent { + } + + /** +- * Returns the item held by the player. If this Item is null and the armor stand Item is also null, ++ * Returns the item held by the player. If this Item is air and the armor stand Item is also air, + * there will be no transaction between the player and the armor stand. +- * If the Player's item is null, but the armor stand item is not then the player will obtain the armor stand item. +- * In the case that the Player's item is not null, but the armor stand item is null, the players item will be placed on the armor stand. +- * If both items are not null, the items will be swapped. ++ * If the Player's item is air, but the armor stand item is not then the player will obtain the armor stand item. ++ * In the case that the Player's item is not air, but the armor stand item is air, the players item will be placed on the armor stand. ++ * If both items are not air, the items will be swapped. + * In the case that the event is cancelled the original items will remain the same. + * @return the item held by the player. + */ +@@ -41,10 +41,10 @@ public class PlayerArmorStandManipulateEvent extends PlayerInteractEntityEvent { + + /** + * Returns the item held by the armor stand. +- * If this Item is null and the player's Item is also null, there will be no transaction between the player and the armor stand. +- * If the Player's item is null, but the armor stand item is not then the player will obtain the armor stand item. +- * In the case that the Player's item is not null, but the armor stand item is null, the players item will be placed on the armor stand. +- * If both items are not null, the items will be swapped. ++ * If this Item is air and the player's Item is also air, there will be no transaction between the player and the armor stand. ++ * If the Player's item is air, but the armor stand item is not then the player will obtain the armor stand item. ++ * In the case that the Player's item is not air, but the armor stand item is air, the players item will be placed on the armor stand. ++ * If both items are not air, the items will be swapped. + * In the case that the event is cancelled the original items will remain the same. + * @return the item held by the armor stand. + */ diff --git a/src/main/java/org/bukkit/inventory/EntityEquipment.java b/src/main/java/org/bukkit/inventory/EntityEquipment.java index d5b50a4a954fed35d37f03f1a277cc173ca106df..a91fa5386afd7a1137adb921ad5adb798604772f 100644 --- a/src/main/java/org/bukkit/inventory/EntityEquipment.java diff --git a/patches/server/0003-Build-system-changes.patch b/patches/server/0003-Build-system-changes.patch index 192df3a196..f6a18e7a7a 100644 --- a/patches/server/0003-Build-system-changes.patch +++ b/patches/server/0003-Build-system-changes.patch @@ -67,7 +67,7 @@ index d10ff4a52c22033e2adb2a4e7f2cee98a13ea6c5..5d8a84341ab5be52b5c37737e3f82590 exclude("org/bukkit/craftbukkit/inventory/ItemStack*Test.class") } diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java -index 79cc8fc158d7fa2010581e72bb3f70fa347174a9..0b3eebd669d9d7a8876ffa8743874703dd14b6a9 100644 +index f0b6c5d9a4e47c70307bc35ab34dc795b1462b04..62530625dac737b7c7be865f2a86fccdb8e78b3e 100644 --- a/src/main/java/org/bukkit/craftbukkit/Main.java +++ b/src/main/java/org/bukkit/craftbukkit/Main.java @@ -192,7 +192,7 @@ public class Main { diff --git a/patches/server/0004-Paper-config-files.patch b/patches/server/0004-Paper-config-files.patch index a8fd418be2..40e5fd63d4 100644 --- a/patches/server/0004-Paper-config-files.patch +++ b/patches/server/0004-Paper-config-files.patch @@ -4355,7 +4355,7 @@ index 57814d847551122a4d700c397cde62d32b840950..7c3d02a8a3bac227692ad2349981bc8c world.serverLevelData.setDifficulty(config.difficulty); world.setSpawnSettings(config.spawnMonsters, config.spawnAnimals); diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java -index 0b3eebd669d9d7a8876ffa8743874703dd14b6a9..d3a5641e84d5b761ebd932a79869a288e2044f4e 100644 +index 62530625dac737b7c7be865f2a86fccdb8e78b3e..0e80299f212d10d6ec7ffba6b2dbeff937d30f55 100644 --- a/src/main/java/org/bukkit/craftbukkit/Main.java +++ b/src/main/java/org/bukkit/craftbukkit/Main.java @@ -131,6 +131,19 @@ public class Main { diff --git a/patches/server/0009-Adventure.patch b/patches/server/0009-Adventure.patch index 8a3fb8a80c..7c02dae1d4 100644 --- a/patches/server/0009-Adventure.patch +++ b/patches/server/0009-Adventure.patch @@ -2722,7 +2722,7 @@ index 6d9469d577dcbb9d5b5b703cf47c8863e0b43b13..9a6820b10e4164cc38d269853b5c2a49 // Paper end } diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java -index d3a5641e84d5b761ebd932a79869a288e2044f4e..ef0d91e72e4ffb829b976da44a5cfe4eedc8703a 100644 +index 0e80299f212d10d6ec7ffba6b2dbeff937d30f55..e15bf67ed9463052c474a56e2ed9da45a710505e 100644 --- a/src/main/java/org/bukkit/craftbukkit/Main.java +++ b/src/main/java/org/bukkit/craftbukkit/Main.java @@ -19,6 +19,12 @@ public class Main { diff --git a/patches/server/0021-Add-command-line-option-to-load-extra-plugin-jars-no.patch b/patches/server/0021-Add-command-line-option-to-load-extra-plugin-jars-no.patch index e1bd4eee16..2858b73a46 100644 --- a/patches/server/0021-Add-command-line-option-to-load-extra-plugin-jars-no.patch +++ b/patches/server/0021-Add-command-line-option-to-load-extra-plugin-jars-no.patch @@ -66,7 +66,7 @@ index eb5c7e15366ee5902d8c754a1e9daec50d26fb17..37fefdf0d96cd2b6e23b6e69ee5a8db1 if (type == PluginLoadOrder.STARTUP) { this.helpMap.clear(); diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java -index ef0d91e72e4ffb829b976da44a5cfe4eedc8703a..0572703c3820d7febeb9da9e0636044209138078 100644 +index e15bf67ed9463052c474a56e2ed9da45a710505e..ef0bbec06981afa13384fb75067599eaa1a87e33 100644 --- a/src/main/java/org/bukkit/craftbukkit/Main.java +++ b/src/main/java/org/bukkit/craftbukkit/Main.java @@ -149,6 +149,12 @@ public class Main { diff --git a/patches/server/0029-Show-Paper-in-client-crashes-server-lists-and-Mojang.patch b/patches/server/0029-Show-Paper-in-client-crashes-server-lists-and-Mojang.patch index 18cb4e718b..a259b9c63f 100644 --- a/patches/server/0029-Show-Paper-in-client-crashes-server-lists-and-Mojang.patch +++ b/patches/server/0029-Show-Paper-in-client-crashes-server-lists-and-Mojang.patch @@ -32,7 +32,7 @@ index 37fefdf0d96cd2b6e23b6e69ee5a8db16f0e51da..fc22de3e1bb4e01fc2c43ffd9ecd0a8c private final String bukkitVersion = Versioning.getBukkitVersion(); private final Logger logger = Logger.getLogger("Minecraft"); diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java -index 0572703c3820d7febeb9da9e0636044209138078..43b8af609fb89cfe23fcab3f741f6dca41888b69 100644 +index ef0bbec06981afa13384fb75067599eaa1a87e33..dbdb2a30c5dbe4f02bc1d1a8ce7294d25e1749d4 100644 --- a/src/main/java/org/bukkit/craftbukkit/Main.java +++ b/src/main/java/org/bukkit/craftbukkit/Main.java @@ -223,12 +223,25 @@ public class Main { diff --git a/patches/server/0105-Add-server-name-parameter.patch b/patches/server/0105-Add-server-name-parameter.patch index 700714446e..abd91cd6fa 100644 --- a/patches/server/0105-Add-server-name-parameter.patch +++ b/patches/server/0105-Add-server-name-parameter.patch @@ -5,7 +5,7 @@ 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 43b8af609fb89cfe23fcab3f741f6dca41888b69..d5f3b44f950ffba5b2680bd2ca5826aae3df2aca 100644 +index dbdb2a30c5dbe4f02bc1d1a8ce7294d25e1749d4..e15375f6985f841ca42dd41eb0035aab0b64a9fb 100644 --- a/src/main/java/org/bukkit/craftbukkit/Main.java +++ b/src/main/java/org/bukkit/craftbukkit/Main.java @@ -156,6 +156,14 @@ public class Main { diff --git a/patches/server/0141-Use-TerminalConsoleAppender-for-console-improvements.patch b/patches/server/0141-Use-TerminalConsoleAppender-for-console-improvements.patch index 4d3d3f8951..47e89994e3 100644 --- a/patches/server/0141-Use-TerminalConsoleAppender-for-console-improvements.patch +++ b/patches/server/0141-Use-TerminalConsoleAppender-for-console-improvements.patch @@ -262,7 +262,7 @@ index 6109763453327f49a15c677a3af8f2de959b58cc..8da0beff6a7937130ecd99dd46880da0 @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 d5f3b44f950ffba5b2680bd2ca5826aae3df2aca..773fe0f425053a450c7b14faf016a35f1d0d266f 100644 +index e15375f6985f841ca42dd41eb0035aab0b64a9fb..5cae8fdd1ad63f49580d69a8c337ae22c0923c5c 100644 --- a/src/main/java/org/bukkit/craftbukkit/Main.java +++ b/src/main/java/org/bukkit/craftbukkit/Main.java @@ -12,7 +12,7 @@ import java.util.logging.Level; diff --git a/patches/server/0157-Fix-this-stupid-bullshit.patch b/patches/server/0157-Fix-this-stupid-bullshit.patch index 426e1e5c03..d4534629d8 100644 --- a/patches/server/0157-Fix-this-stupid-bullshit.patch +++ b/patches/server/0157-Fix-this-stupid-bullshit.patch @@ -31,7 +31,7 @@ index e359919de57f97d18667df1b2f1bf54a19a49c2f..c5822637e48fad4ca4e8cf210431b5ea Bootstrap.isBootstrapped = true; if (Registry.REGISTRY.keySet().isEmpty()) { diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java -index 773fe0f425053a450c7b14faf016a35f1d0d266f..fdbb6ab345833d8163b7d365d03b641d8a09d008 100644 +index 5cae8fdd1ad63f49580d69a8c337ae22c0923c5c..d7d2618bed5188c6e6cc4db6669f3842d0bfff0c 100644 --- a/src/main/java/org/bukkit/craftbukkit/Main.java +++ b/src/main/java/org/bukkit/craftbukkit/Main.java @@ -241,10 +241,12 @@ public class Main { diff --git a/patches/server/0799-Highly-optimise-single-and-multi-AABB-VoxelShapes-an.patch b/patches/server/0799-Highly-optimise-single-and-multi-AABB-VoxelShapes-an.patch index 331f9d5be1..309e93dd2f 100644 --- a/patches/server/0799-Highly-optimise-single-and-multi-AABB-VoxelShapes-an.patch +++ b/patches/server/0799-Highly-optimise-single-and-multi-AABB-VoxelShapes-an.patch @@ -1215,7 +1215,7 @@ index fc14fc8017d89c27b0aeb10a5f38dafde5c15f53..70d648bc5e795355d28579cc2fda43c3 } // CraftBukkit start diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index 036894c89e6dcc98b4e53c859d531163ed155a32..4f19b25518d92c05a1ae49be905abe7dd2f69638 100644 +index 036894c89e6dcc98b4e53c859d531163ed155a32..a7609eb5e037a38d33ffe092502091fbf629db0f 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -1160,9 +1160,44 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { diff --git a/patches/server/0808-Forward-CraftEntity-in-teleport-command.patch b/patches/server/0808-Forward-CraftEntity-in-teleport-command.patch index 92fe7d6f8c..efe396039c 100644 --- a/patches/server/0808-Forward-CraftEntity-in-teleport-command.patch +++ b/patches/server/0808-Forward-CraftEntity-in-teleport-command.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Forward CraftEntity in teleport command diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index 4f19b25518d92c05a1ae49be905abe7dd2f69638..c6f203f95f70ca6286946e2ccc40de05d8eabc49 100644 +index a7609eb5e037a38d33ffe092502091fbf629db0f..4f5a42d2dc7eee3745e4defb69baafd4c0ab72ec 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -3276,6 +3276,13 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { diff --git a/patches/server/0834-Freeze-Tick-Lock-API.patch b/patches/server/0834-Freeze-Tick-Lock-API.patch index 7705d00533..ed8c7e90b7 100644 --- a/patches/server/0834-Freeze-Tick-Lock-API.patch +++ b/patches/server/0834-Freeze-Tick-Lock-API.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Freeze Tick Lock API diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index c6f203f95f70ca6286946e2ccc40de05d8eabc49..f1e471fee49d0213a97251be1b6793d5fb2165f2 100644 +index 4f5a42d2dc7eee3745e4defb69baafd4c0ab72ec..8060e80e69a75a00c7d9d9cc6717088e04f45212 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -397,6 +397,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { diff --git a/patches/server/0872-Ensure-entity-passenger-world-matches-ridden-entity.patch b/patches/server/0872-Ensure-entity-passenger-world-matches-ridden-entity.patch index 16d39906af..1119b22306 100644 --- a/patches/server/0872-Ensure-entity-passenger-world-matches-ridden-entity.patch +++ b/patches/server/0872-Ensure-entity-passenger-world-matches-ridden-entity.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Ensure entity passenger world matches ridden entity Bad plugins doing this would cause some obvious problems... diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index f1e471fee49d0213a97251be1b6793d5fb2165f2..a0c84b3fc264ef25ef1bcdeba482ac23461411f3 100644 +index 8060e80e69a75a00c7d9d9cc6717088e04f45212..eaa52f4d9c98f3b4a6c6505a1734d6667145c10f 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -2684,6 +2684,12 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { diff --git a/patches/server/0873-Guard-against-invalid-entity-positions.patch b/patches/server/0873-Guard-against-invalid-entity-positions.patch index 4c59c50293..2253a075c9 100644 --- a/patches/server/0873-Guard-against-invalid-entity-positions.patch +++ b/patches/server/0873-Guard-against-invalid-entity-positions.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Guard against invalid entity positions Anything not finite should be blocked and logged diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index a0c84b3fc264ef25ef1bcdeba482ac23461411f3..19876a474fec6933322775073d4a161f604a102d 100644 +index eaa52f4d9c98f3b4a6c6505a1734d6667145c10f..1acf20ceccd24816151e74e8c5454ac8fcf7eeb2 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -4187,11 +4187,33 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { diff --git a/patches/server/0897-Prevent-entity-loading-causing-async-lookups.patch b/patches/server/0897-Prevent-entity-loading-causing-async-lookups.patch index 4ac82d46a5..5877c75f53 100644 --- a/patches/server/0897-Prevent-entity-loading-causing-async-lookups.patch +++ b/patches/server/0897-Prevent-entity-loading-causing-async-lookups.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Prevent entity loading causing async lookups diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index 19876a474fec6933322775073d4a161f604a102d..45b740753ac8dd20deb8618d5ac85c48737d34f4 100644 +index 1acf20ceccd24816151e74e8c5454ac8fcf7eeb2..da4147636e12deb2973b47d5cea4c742b1af7423 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -788,6 +788,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { diff --git a/patches/server/0913-Add-various-missing-EntityDropItemEvent-calls.patch b/patches/server/0913-Add-various-missing-EntityDropItemEvent-calls.patch index 7a01a147b2..1b5dcc78f3 100644 --- a/patches/server/0913-Add-various-missing-EntityDropItemEvent-calls.patch +++ b/patches/server/0913-Add-various-missing-EntityDropItemEvent-calls.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add various missing EntityDropItemEvent calls diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index 45b740753ac8dd20deb8618d5ac85c48737d34f4..4df5001ecfe5a3519ac3fbde06cfea2a233d2530 100644 +index da4147636e12deb2973b47d5cea4c742b1af7423..592456de5aac579bbd54f0085302feb693ba2431 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -2520,6 +2520,14 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { diff --git a/patches/server/0919-Add-EntityPortalReadyEvent.patch b/patches/server/0919-Add-EntityPortalReadyEvent.patch index b3b68153bc..788811f23b 100644 --- a/patches/server/0919-Add-EntityPortalReadyEvent.patch +++ b/patches/server/0919-Add-EntityPortalReadyEvent.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add EntityPortalReadyEvent diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index 4df5001ecfe5a3519ac3fbde06cfea2a233d2530..0b3765ff8a25215bc42298b591eeffe022107079 100644 +index 592456de5aac579bbd54f0085302feb693ba2431..a3f1aef9d8f254747bd6580e8e3087a5c6829128 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -2867,6 +2867,13 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { diff --git a/patches/server/0943-Call-BlockPhysicsEvent-more-often.patch b/patches/server/0944-Call-BlockPhysicsEvent-more-often.patch index 532418a20f..532418a20f 100644 --- a/patches/server/0943-Call-BlockPhysicsEvent-more-often.patch +++ b/patches/server/0944-Call-BlockPhysicsEvent-more-often.patch diff --git a/patches/server/0944-Configurable-chat-thread-limit.patch b/patches/server/0945-Configurable-chat-thread-limit.patch index 45a442f6cf..45a442f6cf 100644 --- a/patches/server/0944-Configurable-chat-thread-limit.patch +++ b/patches/server/0945-Configurable-chat-thread-limit.patch diff --git a/patches/server/0945-Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch b/patches/server/0946-Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch index b571f18f1d..b571f18f1d 100644 --- a/patches/server/0945-Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch +++ b/patches/server/0946-Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch |