mirror of
https://github.com/Winds-Studio/Leaf.git
synced 2025-12-20 23:49:31 +00:00
cb54a09d9d
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)
38 lines
2.5 KiB
Diff
38 lines
2.5 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Dreeam <61569423+Dreeam-qwq@users.noreply.github.com>
|
|
Date: Fri, 7 Jun 2024 17:43:43 +0800
|
|
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 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
|
|
@@ -1385,7 +1385,7 @@ public abstract class BlockBehaviour implements FeatureElement {
|
|
@Nullable
|
|
final VoxelShape[] occlusionShapes;
|
|
protected final VoxelShape collisionShape;
|
|
- protected final boolean largeCollisionShape;
|
|
+ protected boolean largeCollisionShape; // Leaf - not final
|
|
private final boolean[] faceSturdy;
|
|
protected final boolean isCollisionShapeFullBlock;
|
|
|
|
@@ -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 {
|
|
- this.largeCollisionShape = Arrays.stream(Direction.Axis.values()).anyMatch((enumdirection_enumaxis) -> {
|
|
- return this.collisionShape.min(enumdirection_enumaxis) < 0.0D || this.collisionShape.max(enumdirection_enumaxis) > 1.0D;
|
|
- });
|
|
+ // Leaf start - Remove stream
|
|
+ for (Direction.Axis axis : Direction.Axis.values()) {
|
|
+ if (this.collisionShape.min(axis) < 0.0D || this.collisionShape.max(axis) > 1.0D) {
|
|
+ this.largeCollisionShape = true;
|
|
+ break;
|
|
+ }
|
|
+ }
|
|
+ // Leaf end - Remove stream
|
|
this.faceSturdy = new boolean[BlockBehaviour.BlockStateBase.Cache.DIRECTIONS.length * BlockBehaviour.BlockStateBase.Cache.SUPPORT_TYPE_COUNT];
|
|
Direction[] aenumdirection1 = BlockBehaviour.BlockStateBase.Cache.DIRECTIONS;
|
|
int k = aenumdirection1.length;
|