mirror of
https://github.com/Winds-Studio/Leaf.git
synced 2025-12-27 10:59:16 +00:00
41c0ee47fc
Upstream has released updates that appear to apply and compile correctly Paper Changes: PaperMC/Paper@dd11ef8 Updated Upstream (Bukkit/CraftBukkit/Spigot) (#11102) PaperMC/Paper@3c8a7fe Re-add missing chunk event calls (#11104) PaperMC/Paper@a8db527 Even more cleanup of mcutil patch PaperMC/Paper@d08e8d1 Add total time to done message (#11109) PaperMC/Paper@2a39276 Add CrafterCraftEvent (#11082) PaperMC/Paper@75af62b Split rewriting flag into `paper.disableOldApiSupport` and `paper.disablePluginRemapping` (#11108) PaperMC/Paper@7ea4039 Fixup startup time log message PaperMC/Paper@e71c1df Call PlayerChunkUnloadEvent PaperMC/Paper@968bdeb Make CraftComplexRecipe extend CraftingRecipe (#11114) PaperMC/Paper@f1f01a1 Adjust done message again (#11118) Gale Changes: Dreeam-qwq/Gale@0096a24 Update Add xor-shift random Dreeam-qwq/Gale@4ce6439 Updated Upstream (Paper) Dreeam-qwq/Gale@d4f0ad7 Updated Upstream (Paper)
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 80d68b91ea4e4eb97e31d1df0c430740fb56bd74..46c410763edba2399b080ca72937a9883f295bfb 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 {
|
|
@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;
|
|
|
|
@@ -1416,9 +1416,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;
|