chore: revert death detection change

Author: moxvallix

src/main/java/meteordevelopment/meteorclient/events/entity/player/PlayerDeathEvent.java

@@ -10,7 +10,6 @@
 import meteordevelopment.meteorclient.commands.Commands;
 import meteordevelopment.meteorclient.events.entity.EntityDestroyEvent;
 import meteordevelopment.meteorclient.events.entity.player.PickItemsEvent;
-import meteordevelopment.meteorclient.events.entity.player.PlayerDeathEvent;
 import meteordevelopment.meteorclient.events.game.GameJoinedEvent;
 import meteordevelopment.meteorclient.events.game.GameLeftEvent;
 import meteordevelopment.meteorclient.events.game.SendMessageEvent;
@@ -166,12 +165,4 @@ private void onSendChatMessage(String message, CallbackInfo ci) {
             ci.cancel();
         }
     }
-
-    // When receiving the death message packet, send the PlayerDeathEvent
-    @Inject(method = "onDeathMessage", at = @At("HEAD"))
-    private void onClientDeath(DeathMessageS2CPacket packet, CallbackInfo ci) {
-        if (client.player == null || world.getEntityById(packet.playerId()) != client.player) return;
-
-        MeteorClient.EVENT_BUS.post(PlayerDeathEvent.get());
-    }
 }

src/main/java/meteordevelopment/meteorclient/mixin/ClientPlayNetworkHandlerMixin.java

@@ -23,6 +23,7 @@ public AutoRespawn() {
     private void onOpenScreenEvent(OpenScreenEvent event) {
         if (!(event.screen instanceof DeathScreen)) return;
 
+        Modules.get().get(WaypointsModule.class).addDeath(mc.player.getPos());
         mc.player.requestRespawn();
         event.cancel();
     }

src/main/java/meteordevelopment/meteorclient/systems/modules/player/AutoRespawn.java

@@ -5,7 +5,7 @@
 
 package meteordevelopment.meteorclient.systems.modules.render;
 
-import meteordevelopment.meteorclient.events.entity.player.PlayerDeathEvent;
+import meteordevelopment.meteorclient.events.game.OpenScreenEvent;
 import meteordevelopment.meteorclient.events.render.Render2DEvent;
 import meteordevelopment.meteorclient.gui.GuiTheme;
 import meteordevelopment.meteorclient.gui.renderer.GuiRenderer;
@@ -29,6 +29,7 @@
 import meteordevelopment.meteorclient.utils.render.color.Color;
 import meteordevelopment.orbit.EventHandler;
 import net.minecraft.client.MinecraftClient;
+import net.minecraft.client.gui.screen.DeathScreen;
 import net.minecraft.text.MutableText;
 import net.minecraft.text.Text;
 import net.minecraft.util.math.BlockPos;
@@ -160,10 +161,10 @@ private void onRender2D(Render2DEvent event) {
     }
 
     @EventHandler
-    private void onPlayerDeath(PlayerDeathEvent event) {
-        if (mc.player == null) return;
+    private void onOpenScreen(OpenScreenEvent event) {
+        if (!(event.screen instanceof DeathScreen)) return;
 
-        addDeath(mc.player.getPos());
+        if (!event.isCancelled()) addDeath(mc.player.getPos());
     }
 
     public void addDeath(Vec3d deathPos) {