fix: fix onEffectUpdated

Author: ShrBox

src/legacy/api/EventAPI.cpp

@@ -560,7 +560,7 @@ void EnableEventListener(int eventId) {
         lse::events::player::RemoveEffectEvent();
         break;
     case EVENT_TYPES::onEffectUpdated:
-        lse::events::entity::EffectUpdateEvent();
+        lse::events::player::AddEffectEvent();
         break;
 
     case EVENT_TYPES::onUseRespawnAnchor:

src/lse/events/EntityEvents.cpp

@@ -373,33 +373,6 @@ LL_TYPE_STATIC_HOOK(
     origin(owner, sourcePlayer, actionIndex, sceneName);
 }
 
-LL_TYPE_STATIC_HOOK(
-    EffectUpdateHook,
-    HookPriority::Normal,
-    MinecraftEventing,
-    &MinecraftEventing::fireEventMobEffectChanged,
-    void,
-    ::Mob&                          mob,
-    ::MobEffectInstance const&      effectInstance,
-    ::MinecraftEventing::ChangeType change
-) {
-    IF_LISTENED(EVENT_TYPES::onEffectUpdated) {
-        if (isServerThread() && mob.isPlayer()) {
-            if (!CallEvent(
-                    EVENT_TYPES::onEffectUpdated,
-                    PlayerClass::newPlayer(&reinterpret_cast<Player&>(mob)),
-                    String::newString(MobEffect::mMobEffects()[effectInstance.mId]->mComponentName->getString()),
-                    Number::newNumber(effectInstance.mAmplifier),
-                    Number::newNumber(effectInstance.mDuration->mValue)
-                )) {
-                return;
-            }
-        }
-    }
-    IF_LISTENED_END(EVENT_TYPES::onEffectUpdated);
-    origin(mob, effectInstance, change);
-}
-
 namespace Transformation {
 std::pair<EntityId, Actor*> currentActor = {{}, nullptr};
 LL_TYPE_INSTANCE_HOOK(
@@ -504,7 +477,6 @@ void ProjectileHitBlockEvent() { static ll::memory::HookRegistrar<ProjectileHitB
 void MobHurtEvent() { static ll::memory::HookRegistrar<MobHurtHook> reg; }
 void NpcCommandEvent() { static ll::memory::HookRegistrar<NpcCommandHook> reg; }
 void EndermanTakeBlockEvent() { static ll::memory::HookRegistrar<EndermanTakeBlockHook> reg; }
-void EffectUpdateEvent() { static ll::memory::HookRegistrar<EffectUpdateHook> reg; }
 void TransformationEvent() {
     static ll::memory::HookRegistrar<Transformation::addEntityHook, Transformation::TransformedActorHook> reg;
 }

src/lse/events/PlayerEvents.cpp

@@ -609,14 +609,26 @@ LL_TYPE_INSTANCE_HOOK(
 ) {
     IF_LISTENED(EVENT_TYPES::onEffectAdded) {
         if (isServerThread() && isPlayer()) {
-            if (!CallEvent(
-                    EVENT_TYPES::onEffectAdded,
-                    PlayerClass::newPlayer(reinterpret_cast<Player*>(this)),
-                    String::newString(MobEffect::mMobEffects()[effect.mId]->mComponentName->getString()),
-                    Number::newNumber(effect.mAmplifier),
-                    Number::newNumber(effect.mDuration->mValue)
-                )) {
-                return;
+            if (getEffect(effect.mId)) {
+                if (!CallEvent(
+                        EVENT_TYPES::onEffectUpdated,
+                        PlayerClass::newPlayer(reinterpret_cast<Player*>(this)),
+                        String::newString(MobEffect::mMobEffects()[effect.mId]->mComponentName->getString()),
+                        Number::newNumber(effect.mAmplifier),
+                        Number::newNumber(effect.mDuration->mValue)
+                    )) {
+                    return;
+                }
+            } else {
+                if (!CallEvent(
+                        EVENT_TYPES::onEffectAdded,
+                        PlayerClass::newPlayer(reinterpret_cast<Player*>(this)),
+                        String::newString(MobEffect::mMobEffects()[effect.mId]->mComponentName->getString()),
+                        Number::newNumber(effect.mAmplifier),
+                        Number::newNumber(effect.mDuration->mValue)
+                    )) {
+                    return;
+                }
             }
         }
     }
@@ -701,4 +713,5 @@ void InteractEntityEvent() { static ll::memory::HookRegistrar<InteractEntityHook
 void AddEffectEvent() { static ll::memory::HookRegistrar<AddEffectHook> reg; }
 void RemoveEffectEvent() { static ll::memory::HookRegistrar<RemoveEffectHook> reg; }
 void BlockInteractedEvent() { static ll::memory::HookRegistrar<BlockInteractedHook> reg; }
+void EffectUpdateEvent() { AddEffectEvent(); }
 } // namespace lse::events::player