fix: fix a problem in onUseBucketTake

Author: ShrBox

src/legacy/api/EventAPI.cpp

@@ -380,21 +380,6 @@ void EnableEventListener(int eventId) {
         break;
     case EVENT_TYPES::onUseBucketTake:
         lse::events::PlayerUseBucketTakeEvent();
-        bus.emplaceListener<PlayerUseItemOnEvent>([](PlayerUseItemOnEvent& ev) {
-            if (ev.item().isItem() && ev.item().getTypeName().contains("bucket")) {
-                IF_LISTENED(EVENT_TYPES::onUseBucketTake) {
-                    CallEvent(
-                        EVENT_TYPES::onUseBucketTake,
-                        PlayerClass::newPlayer(&ev.self()),
-                        ItemClass::newItem(&ev.item(), false),
-                        BlockClass::newBlock(&ev.blockPos(), ev.self().getDimensionId()),
-                        Number::newNumber(ev.face()),
-                        FloatPos::newPos(ev.clickPos(), ev.self().getDimensionId())
-                    );
-                }
-                IF_LISTENED_END(EVENT_TYPES::onUseBucketTake);
-            }
-        });
         break;
 
     case EVENT_TYPES::onContainerChange:

src/legacy/events/EventHooks.cpp

@@ -15,6 +15,7 @@
 
 #include <ll/api/memory/Hook.h>
 #include <ll/api/memory/Memory.h>
+#include <mc/common/wrapper/InteractionResult.h>
 #include <mc/entity/WeakEntityRef.h>
 #include <mc/entity/utilities/ActorType.h>
 #include <mc/server/module/VanillaServerGameplayEventListener.h>
@@ -907,6 +908,33 @@ LL_TYPE_INSTANCE_HOOK(
     return origin(item, entity, pos);
 }
 
+// LL_TYPE_INSTANCE_HOOK(
+//     PlayerUseBucketTakeHook3,
+//     HookPriority::Normal,
+//     BucketItem,
+//     &BucketItem::_useOn,
+//     InteractionResult,
+//     ItemStack&  instance,
+//     Actor&      entity,
+//     BlockPos    pos,
+//     uchar       face,
+//     Vec3 const& clickPos
+// ) {
+//     IF_LISTENED(EVENT_TYPES::onUseBucketTake) {
+//         CallEventRtnValue(
+//             EVENT_TYPES::onUseBucketTake,
+//             InteractionResult{InteractionResult::Result::Fail},
+//             PlayerClass::newPlayer(),
+//             ItemClass::newItem(&instance, false),
+//             EntityClass::newEntity(&entity),
+//             Number::newNumber(face),
+//             FloatPos::newPos(pos, entity.getDimensionId())
+//         );
+//     }
+//     IF_LISTENED_END(EVENT_TYPES::onUseBucketTake);
+//     return origin(instance, entity, pos, face, clickPos);
+// }
+
 void PlayerStartDestroyBlock() { PlayerStartDestroyHook::hook(); }
 void PlayerDropItem() { PlayerDropItemHook::hook(); }
 void PlayerOpenContainerEvent() { PlayerOpenContainerHook::hook(); }