9
0
mirror of https://github.com/Winds-Studio/Leaf.git synced 2025-12-20 15:39:37 +00:00

Updated Upstream (Gale/Purpur/Leaves)

This commit is contained in:
Dreeam
2024-07-13 18:17:13 +08:00
parent 54be93dd23
commit cf8716a368
20 changed files with 182 additions and 193 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 155a099eb9b0196385947f5765fad4e5c5b74b44..8b46772221cd60691a6cc4f6b691bdfe94e78608 100644
index ef2a3ed8e95de4cbbe85803f0146ab3901b26947..4120d015f82b6a2ff4ac2c72dfca11da1e8037cb 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
@@ -1302,7 +1302,7 @@ public abstract class BlockBehaviour implements FeatureElement {
@@ -1390,7 +1390,7 @@ public abstract class BlockBehaviour implements FeatureElement {
@Nullable
final VoxelShape[] occlusionShapes;
protected final VoxelShape collisionShape;
@@ -17,7 +17,7 @@ index 155a099eb9b0196385947f5765fad4e5c5b74b44..8b46772221cd60691a6cc4f6b691bdfe
private final boolean[] faceSturdy;
protected final boolean isCollisionShapeFullBlock;
@@ -1334,9 +1334,14 @@ public abstract class BlockBehaviour implements FeatureElement {
@@ -1422,9 +1422,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 {