Player damage event update

Author: emyfops

common/src/main/java/com/lambda/mixin/entity/ClientPlayerEntityMixin.java

@@ -28,6 +28,7 @@
 import net.minecraft.client.network.ClientPlayerEntity;
 import net.minecraft.entity.MovementType;
 import net.minecraft.entity.damage.DamageSource;
+import net.minecraft.network.packet.s2c.play.EntityDamageS2CPacket;
 import net.minecraft.util.Hand;
 import net.minecraft.util.math.Vec3d;
 import org.spongepowered.asm.mixin.Mixin;
@@ -124,10 +125,8 @@ void onSwingHandPre(Hand hand, CallbackInfo ci) {
         if (EventFlow.post(new PlayerEvent.SwingHand(hand)).isCanceled()) ci.cancel();
     }
 
-    @Inject(method = "damage", at = @At("HEAD"), cancellable = true)
-    public void damage(DamageSource source, float amount, CallbackInfoReturnable<Boolean> cir) {
-        if (EventFlow.post(new PlayerEvent.Damage(source, amount)).isCanceled()) {
-            cir.setReturnValue(false);
-        }
+    @Inject(method = "updateHealth", at = @At("HEAD"))
+    public void damage(float health, CallbackInfo ci) {
+        EventFlow.post(new PlayerEvent.Damage(health));
     }
 }

common/src/main/java/com/lambda/mixin/entity/EntityMixin.java

@@ -98,14 +98,4 @@ public void onTrackedDataSet(TrackedData<?> data, CallbackInfo ci) {
 
         EventFlow.post(new EntityEvent.EntityUpdate(entity, data));
     }
-
-    // ToDo: Does not trigger for some reason.
-    @Inject(method = "damage", at = @At("HEAD"), cancellable = true)
-    public void damage(DamageSource source, float amount, CallbackInfoReturnable<Boolean> cir) {
-        Entity entity = (Entity) (Object) this;
-
-        if (EventFlow.post(new EntityEvent.Damage(entity, source, amount)).isCanceled()) {
-            cir.setReturnValue(false);
-        }
-    }
 }

common/src/main/kotlin/com/lambda/event/events/PlayerEvent.kt

@@ -17,6 +17,7 @@
 
 package com.lambda.event.events
 
+import com.lambda.event.Event
 import com.lambda.event.callback.Cancellable
 import com.lambda.event.callback.ICancellable
 import net.minecraft.entity.damage.DamageSource
@@ -52,15 +53,11 @@ sealed class PlayerEvent {
     ) : ICancellable by Cancellable()
 
     /**
-     * Represents a damage event for entities.
+     * Represents a damage event for the player.
      *
-     * @property source The source of the damage, which identifies what caused the damage.
      * @property amount The amount of damage dealt.
      */
-    data class Damage(
-        val source: DamageSource,
-        val amount: Float,
-    ) : ICancellable by Cancellable()
+    data class Damage(val amount: Float) : Event
 
     sealed class Interact {
         /**

common/src/main/kotlin/com/lambda/module/modules/combat/AutoDisconnect.kt

@@ -103,10 +103,12 @@ object AutoDisconnect : Module(
                 trident to DamageTypes.TRIDENT
             )
 
-            damageHandlers.firstOrNull { (enabled, damageSource) ->
-                enabled && event.source.isOf(damageSource)
-            }?.let {
-                damageDisconnect(event.source, event.amount)
+            player.recentDamageSource?.let { source ->
+                damageHandlers.firstOrNull { (enabled, damageSource) ->
+                    enabled && source.isOf(damageSource)
+                }?.let {
+                    damageDisconnect(source, event.amount)
+                }
             }
         }
     }