diff options
| author | Jake Potrebic <[email protected]> | 2024-08-17 12:39:11 -0700 |
|---|---|---|
| committer | GitHub <[email protected]> | 2024-08-17 12:39:11 -0700 |
| commit | 0e7361704a16c8386d829c26603f3e5c0bf72b39 (patch) | |
| tree | 1b6be3f26cc43bf2a36eb014ccb01b65a3737f6b /patches/server/0281-Fixes-and-additions-to-the-spawn-reason-API.patch | |
| parent | 75655ec1d34f344c7b0ba9f31f2ada87951d277d (diff) | |
| download | Paper-0e7361704a16c8386d829c26603f3e5c0bf72b39.tar.gz Paper-0e7361704a16c8386d829c26603f3e5c0bf72b39.zip | |
Updated Upstream (Bukkit/CraftBukkit/Spigot) (#11284)
Updated Upstream (Bukkit/CraftBukkit/Spigot)
Upstream has released updates that appear to apply and compile correctly.
This update has not been tested by PaperMC and as with ANY update, please do your own testing
Bukkit Changes:
4068c6aa PR-1053: Change docs for max power in FireworkMeta
6b3c241b SPIGOT-7783, SPIGOT-7784, PR-1051: Add Trial Vault & Spawner event API
5fe300ec PR-1052: Fix broken links and minor improvement for checkstyle.xml
CraftBukkit Changes:
7548afcf2 SPIGOT-7872: Fix crash with event-modified teleports
93480d5d6 SPIGOT-7868, PR-1463: Fix default and max power in FireworkMeta
5060d1a84 SPIGOT-7783, SPIGOT-7784, PR-1460: Add Trial Vault & Spawner event API
11dfcae71 PR-1462: Fix broken links and minor improvement for checkstyle.xml
Spigot Changes:
ca581228 Rebuild patches
Diffstat (limited to 'patches/server/0281-Fixes-and-additions-to-the-spawn-reason-API.patch')
| -rw-r--r-- | patches/server/0281-Fixes-and-additions-to-the-spawn-reason-API.patch | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/patches/server/0281-Fixes-and-additions-to-the-spawn-reason-API.patch b/patches/server/0281-Fixes-and-additions-to-the-spawn-reason-API.patch index 944ab1ff65..a8fda4a8d7 100644 --- a/patches/server/0281-Fixes-and-additions-to-the-spawn-reason-API.patch +++ b/patches/server/0281-Fixes-and-additions-to-the-spawn-reason-API.patch @@ -202,10 +202,10 @@ index dbc0b69603dcffbf3d41d79719aa0f2b7da4a131..dd86f5ec5b2051aeea4e19ff97146362 } diff --git a/src/main/java/net/minecraft/world/level/block/entity/trialspawner/TrialSpawner.java b/src/main/java/net/minecraft/world/level/block/entity/trialspawner/TrialSpawner.java -index 52d71a03cd5b2af56704f265ce5b5f14d3236ebb..ffca6563c20f53c92b162054fec727d83e54e58a 100644 +index c3f6522a7dc0777c5b3fa2bac63a8901f96d9f38..9b336f651ead8111a0b2c0fedad9331f594b2990 100644 --- a/src/main/java/net/minecraft/world/level/block/entity/trialspawner/TrialSpawner.java +++ b/src/main/java/net/minecraft/world/level/block/entity/trialspawner/TrialSpawner.java -@@ -226,6 +226,7 @@ public final class TrialSpawner { +@@ -231,6 +231,7 @@ public final class TrialSpawner { } entity.spawnedViaMobSpawner = true; // Paper |