Skip to content

Commit

Permalink
Fix wrong dimension in events of LLSE
Browse files Browse the repository at this point in the history
Events: onUseItemOn, onBucketPlace, onBucketTake
Co-Authored-By: timiya <[email protected]>
  • Loading branch information
Jasonzyt and timiya233 committed Jan 14, 2023
1 parent a8b27c2 commit 9e6114d
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions ScriptEngine/src/api/EventAPI.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -555,7 +555,7 @@ void EnableEventListener(int eventId) {
IF_LISTENED(EVENT_TYPES::onUseItemOn) {
CallEvent(EVENT_TYPES::onUseItemOn, PlayerClass::newPlayer((Player*)ev.mPlayer),
ItemClass::newItem(ev.mItemStack), BlockClass::newBlock(ev.mBlockInstance),
Number::newNumber(ev.mFace), FloatPos::newPos(ev.mClickPos));
Number::newNumber(ev.mFace), FloatPos::newPos(ev.mClickPos, ev.mPlayer->getDimensionId()));
}
IF_LISTENED_END(EVENT_TYPES::onUseItemOn);
});
Expand All @@ -568,19 +568,19 @@ void EnableEventListener(int eventId) {
IF_LISTENED(EVENT_TYPES::onUseBucketPlace) {
CallEvent(EVENT_TYPES::onUseBucketPlace, PlayerClass::newPlayer((Player*)ev.mPlayer),
ItemClass::newItem(ev.mBucket), BlockClass::newBlock(ev.mBlockInstance),
Number::newNumber(ev.mFace), FloatPos::newPos(ev.mTargetPos));
Number::newNumber(ev.mFace), FloatPos::newPos(ev.mTargetPos, ev.mPlayer->getDimensionId()));
}
IF_LISTENED_END(EVENT_TYPES::onUseBucketPlace);
} else if (ev.mEventType == PlayerUseBucketEvent::EventType::Take) {
IF_LISTENED(EVENT_TYPES::onUseBucketTake) {
if (ev.mTargetActor) {
CallEvent(EVENT_TYPES::onUseBucketTake, PlayerClass::newPlayer((Player*)ev.mPlayer),
ItemClass::newItem(ev.mBucket), EntityClass::newEntity(ev.mTargetActor),
Number::newNumber(ev.mFace), FloatPos::newPos(ev.mTargetPos));
Number::newNumber(ev.mFace), FloatPos::newPos(ev.mTargetPos, ev.mPlayer->getDimensionId()));
} else {
CallEvent(EVENT_TYPES::onUseBucketTake, PlayerClass::newPlayer((Player*)ev.mPlayer),
ItemClass::newItem(ev.mBucket), BlockClass::newBlock(ev.mBlockInstance),
Number::newNumber(ev.mFace), FloatPos::newPos(ev.mTargetPos));
Number::newNumber(ev.mFace), FloatPos::newPos(ev.mTargetPos, ev.mPlayer->getDimensionId()));
}
}
IF_LISTENED_END(EVENT_TYPES::onUseBucketTake);
Expand Down

0 comments on commit 9e6114d

Please sign in to comment.