9
0
mirror of https://github.com/Winds-Studio/Leaf.git synced 2025-12-21 07:59:26 +00:00

Updated Upstream (Paper/Gale/Purpur/Leaves)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@042f15f [ci skip] chore: fix incorrect commit hash in PR builds (#11198)
PaperMC/Paper@4e6a2a1 Check for block type in SculkSensorBlock#canActivate
PaperMC/Paper@77a5779 Updated Upstream (Bukkit/CraftBukkit/Spigot) (#11197)
PaperMC/Paper@4d7cef3 Fix source of knockback for spigot events (#11176)
PaperMC/Paper@b1b5d4c Check shooter in configurable projectile relative velocity patch

Gale Changes:
Dreeam-qwq/Gale@33fb580 Updated Upstream (Paper)
Dreeam-qwq/Gale@3a5ff70 Updated Upstream (Paper)

Purpur Changes:
PurpurMC/Purpur@7950960 Updated Upstream (Paper)
PurpurMC/Purpur@73a90e8 Updated Upstream (Paper)
PurpurMC/Purpur@75e81d8 deprecate old anvil api methods
PurpurMC/Purpur@4e55e26 final 1.21 Paper upstream

Leaves Changes:
LeavesMC/Leaves@26e31ff Update fakeplayer, and fix #298
LeavesMC/Leaves@af01380 And make #297 happy
LeavesMC/Leaves@1782bd4 [ci-skip] Serve immediately (#295)
This commit is contained in:
Dreeam
2024-08-11 18:21:21 +08:00
parent f3b9b961db
commit cb54a09d9d
7 changed files with 176 additions and 61 deletions

View File

@@ -5,10 +5,10 @@ Subject: [PATCH] Remove stream in BlockBehaviour cache blockstate
diff --git a/src/main/java/net/minecraft/world/level/block/state/BlockBehaviour.java b/src/main/java/net/minecraft/world/level/block/state/BlockBehaviour.java
index 80d68b91ea4e4eb97e31d1df0c430740fb56bd74..46c410763edba2399b080ca72937a9883f295bfb 100644
index 40f15a30b1a0dd2040e75045f32f33082e70aaeb..cdaa5a8af0c6a8a78e587141b9ab1c84766589e9 100644
--- a/src/main/java/net/minecraft/world/level/block/state/BlockBehaviour.java
+++ b/src/main/java/net/minecraft/world/level/block/state/BlockBehaviour.java
@@ -1384,7 +1384,7 @@ public abstract class BlockBehaviour implements FeatureElement {
@@ -1385,7 +1385,7 @@ public abstract class BlockBehaviour implements FeatureElement {
@Nullable
final VoxelShape[] occlusionShapes;
protected final VoxelShape collisionShape;
@@ -17,7 +17,7 @@ index 80d68b91ea4e4eb97e31d1df0c430740fb56bd74..46c410763edba2399b080ca72937a988
private final boolean[] faceSturdy;
protected final boolean isCollisionShapeFullBlock;
@@ -1416,9 +1416,14 @@ public abstract class BlockBehaviour implements FeatureElement {
@@ -1417,9 +1417,14 @@ public abstract class BlockBehaviour implements FeatureElement {
if (!this.collisionShape.isEmpty() && state.hasOffsetFunction()) {
throw new IllegalStateException(String.format(Locale.ROOT, "%s has a collision shape and an offset type, but is not marked as dynamicShape in its properties.", BuiltInRegistries.BLOCK.getKey(block)));
} else {