Fix compile err

2026-08-17 23:55:29 +08:00
parent 2edb70257d
commit 0cc941be27
2 changed files with 5 additions and 5 deletions
@@ -1,7 +1,7 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: NanaChiyo0721 <nanachiyo0721@163.com>
 Date: Mon, 17 Aug 2026 23:38:00 +0800
-Subject: [PATCH] Leaves: Vanilla hopper
+Subject: [PATCH] Leaves Vanilla hopper

 Co-Authored-By: Creeam <102713261+HaHaWTH@users.noreply.github.com>

@@ -11,7 +11,7 @@ Original project: https://github.com/LeavesMC/Leaves
 This is a temporary solution designed to attempt to restore the vanilla behavior of the funnel while preserving optimizations as much as possible. It should ultimately be replaced by the optimization solution provided by lithium.

 diff --git a/net/minecraft/world/level/block/entity/HopperBlockEntity.java b/net/minecraft/world/level/block/entity/HopperBlockEntity.java
-index a858cb658af70f07614fa1f4d9e8a3435d5c161f..9f7f8edaf3261cc0377dab33404ca1d30c548ff9 100644
+index a858cb658af70f07614fa1f4d9e8a3435d5c161f..b418d11d5bff749c3eaf1b34c5727bfa8c295dbd 100644
 --- a/net/minecraft/world/level/block/entity/HopperBlockEntity.java
 +++ b/net/minecraft/world/level/block/entity/HopperBlockEntity.java
@@ -281,36 +281,67 @@ public class HopperBlockEntity extends RandomizableContainerBlockEntity implemen
@@ -21,10 +21,10 @@ index a858cb658af70f07614fa1f4d9e8a3435d5c161f..9f7f8edaf3261cc0377dab33404ca1d3
 -        container.setChanged(); // original logic always marks source inv as changed even if no move happens.
 -        movedItem.setCount(movedItemCount);
 +        // Leaves start - Vanilla hopper
-+        if (org.dreeam.leaf.config.modules.gameplay.VanillaHopper.enabled && movedItemCount == 1) {
+        if (movedItemCount == 1) {
 +            movedItem.setCount(movedItemCount);
 +            container.setChanged();
-+            if (!skipPullModeEventFire) {
+            if (!worldData.skipPullModeEventFire) {
 +                movedItem = callPullMoveEvent(hopper, container, movedItem);
 +                if (movedItem == null) { // cancelled
 +                    origItemStack.setCount(originalItemCount);