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: 044d4ee9 SPIGOT-7283, SPIGOT-7318: Add AsyncStructureGenerateEvent and BlockState cloning 57b73d57 PR-913: Deprecate Projectile#doesBounce() and #setBounce() 43373c44 PR-904: Update FeatureFlag for 1.20.2 a7bbbf0c PR-911: Expand DataPack API with 1.20.2 pack version methods 0341e3a0 SPIGOT-7489: Add TeleportDuration to Display Entity bcd8d2aa PR-912: Update Minecraft Wiki URLs CraftBukkit Changes: 99aafc222 Increase outdated build delay dab849f08 SPIGOT-7283, SPIGOT-7318: Add AsyncStructureGenerateEvent and BlockState cloning 041b29ae3 Upgrade specialsource-maven-plugin 851a32cff PR-1263: Remove unused implementation of AbstractProjectile#doesBounce() and #setBounce() 251af0da3 PR-1261: Expand DataPack API with 1.20.2 pack version methods 46e4ba627 Upgrade specialsource-maven-plugin df3738a24 SPIGOT-7489: Add TeleportDuration to Display Entity 8d0fea457 PR-1262: Update Minecraft Wiki URLs e62905aab SPIGOT-7490: Fix entity equipment updates Spigot Changes: a0f3d486 Rebuild patches
This commit is contained in:
parent
1765917a6f
commit
4cdbb0c86c
125 changed files with 379 additions and 302 deletions
|
@ -257,3 +257,16 @@ index 69a19dbf58cde41680d086e78b9a12ffee602dbf..5dcb7f9cab097990148f5a7c4ccbe155
|
|||
return AbortableIterationConsumer.Continuation.ABORT;
|
||||
}
|
||||
}
|
||||
diff --git a/src/main/java/net/minecraft/world/level/levelgen/structure/StructurePiece.java b/src/main/java/net/minecraft/world/level/levelgen/structure/StructurePiece.java
|
||||
index 9b1d6cad982d85874fd7cedee730e5155dba8f80..507c0f1e92a5e1bfe2a64a6d125af9353b3c67aa 100644
|
||||
--- a/src/main/java/net/minecraft/world/level/levelgen/structure/StructurePiece.java
|
||||
+++ b/src/main/java/net/minecraft/world/level/levelgen/structure/StructurePiece.java
|
||||
@@ -489,7 +489,7 @@ public abstract class StructurePiece {
|
||||
}
|
||||
|
||||
public static BoundingBox createBoundingBox(Stream<StructurePiece> pieces) {
|
||||
- Stream stream1 = pieces.map(StructurePiece::getBoundingBox);
|
||||
+ Stream<BoundingBox> stream1 = pieces.map(StructurePiece::getBoundingBox); // Paper - decompile fx
|
||||
|
||||
Objects.requireNonNull(stream1);
|
||||
return (BoundingBox) BoundingBox.encapsulatingBoxes(stream1::iterator).orElseThrow(() -> {
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue