9
0
mirror of https://github.com/Winds-Studio/Leaf.git synced 2026-01-06 15:51:31 +00:00

Updated Upstream (Paper/Gale)

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)
This commit is contained in:
Dreeam
2024-07-20 08:05:38 +08:00
parent 8aa8b7d26c
commit 41c0ee47fc
19 changed files with 137 additions and 149 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 ef2a3ed8e95de4cbbe85803f0146ab3901b26947..4120d015f82b6a2ff4ac2c72dfca11da1e8037cb 100644
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
@@ -1390,7 +1390,7 @@ public abstract class BlockBehaviour implements FeatureElement {
@@ -1384,7 +1384,7 @@ public abstract class BlockBehaviour implements FeatureElement {
@Nullable
final VoxelShape[] occlusionShapes;
protected final VoxelShape collisionShape;
@@ -17,7 +17,7 @@ index ef2a3ed8e95de4cbbe85803f0146ab3901b26947..4120d015f82b6a2ff4ac2c72dfca11da
private final boolean[] faceSturdy;
protected final boolean isCollisionShapeFullBlock;
@@ -1422,9 +1422,14 @@ public abstract class BlockBehaviour implements FeatureElement {
@@ -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 {