From 91894380cbf8710052d19ebf297c632d4320f02d Mon Sep 17 00:00:00 2001
From: TheLostTree <65834918+TheLostTree@users.noreply.github.com>
Date: Sat, 23 Apr 2022 03:19:33 -0700
Subject: [PATCH 1/3] drowning added

---
 .../recv/HandlerSceneEntityDrownReq.java      | 43 +++++++++++++++++++
 .../send/PacketSceneEntityDrownRsp.java       |  4 ++
 2 files changed, 47 insertions(+)
 create mode 100644 src/main/java/emu/grasscutter/server/packet/recv/HandlerSceneEntityDrownReq.java
 create mode 100644 src/main/java/emu/grasscutter/server/packet/send/PacketSceneEntityDrownRsp.java

diff --git a/src/main/java/emu/grasscutter/server/packet/recv/HandlerSceneEntityDrownReq.java b/src/main/java/emu/grasscutter/server/packet/recv/HandlerSceneEntityDrownReq.java
new file mode 100644
index 000000000..91f27c65b
--- /dev/null
+++ b/src/main/java/emu/grasscutter/server/packet/recv/HandlerSceneEntityDrownReq.java
@@ -0,0 +1,43 @@
+package emu.grasscutter.server.packet.recv;
+
+import emu.grasscutter.game.entity.GenshinEntity;
+import emu.grasscutter.game.props.LifeState;
+import emu.grasscutter.net.packet.Opcodes;
+import emu.grasscutter.net.packet.PacketHandler;
+import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.proto.SceneEntityDrownReqOuterClass.SceneEntityDrownReq;
+import emu.grasscutter.net.proto.VisionTypeOuterClass;
+import emu.grasscutter.server.game.GameSession;
+import emu.grasscutter.server.packet.send.PacketAvatarChangeCostumeRsp;
+import emu.grasscutter.server.packet.send.PacketLifeStateChangeNotify;
+import emu.grasscutter.server.packet.send.PacketSceneEntityDisappearNotify;
+import emu.grasscutter.server.packet.send.PacketSceneEntityDrownRsp;
+
+@Opcodes(PacketOpcodes.SceneEntityDrownReq)
+public class HandlerSceneEntityDrownReq extends PacketHandler {
+
+    @Override
+    public void handle(GameSession session, byte[] header, byte[] payload) throws Exception {
+        SceneEntityDrownReq req = SceneEntityDrownReq.parseFrom(payload);
+
+
+        GenshinEntity entity = session.getPlayer().getScene().getEntityById(req.getEntityId());
+
+
+        PacketLifeStateChangeNotify lifeStateChangeNotify = new PacketLifeStateChangeNotify(entity, entity, LifeState.LIFE_DEAD);
+        PacketSceneEntityDrownRsp drownRsp = new PacketSceneEntityDrownRsp(req.getEntityId());
+
+
+
+        //kill entity + broadcast it
+
+        session.getPlayer().getScene().broadcastPacket(lifeStateChangeNotify);
+        session.getPlayer().getScene().broadcastPacket(drownRsp);
+
+        //TODO: make a list somewhere of all entities to remove per tick rather than one by one
+
+        session.getPlayer().getScene().removeEntity(entity, VisionTypeOuterClass.VisionType.VisionDie);
+
+    }
+
+}
diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketSceneEntityDrownRsp.java b/src/main/java/emu/grasscutter/server/packet/send/PacketSceneEntityDrownRsp.java
new file mode 100644
index 000000000..2918c2f66
--- /dev/null
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketSceneEntityDrownRsp.java
@@ -0,0 +1,4 @@
+package emu.grasscutter.server.packet.send;
+
+public class PacketSceneEntityDrownReq {
+}

From 3d9b71dc4d4f376a175b36d53b5734b900fc5a2e Mon Sep 17 00:00:00 2001
From: TheLostTree <65834918+TheLostTree@users.noreply.github.com>
Date: Sat, 23 Apr 2022 03:32:08 -0700
Subject: [PATCH 2/3] git doesnt like me

---
 .../recv/HandlerSceneEntityDrownReq.java       |  2 --
 .../packet/send/PacketSceneEntityDrownRsp.java | 18 +++++++++++++++++-
 2 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/src/main/java/emu/grasscutter/server/packet/recv/HandlerSceneEntityDrownReq.java b/src/main/java/emu/grasscutter/server/packet/recv/HandlerSceneEntityDrownReq.java
index 91f27c65b..005141958 100644
--- a/src/main/java/emu/grasscutter/server/packet/recv/HandlerSceneEntityDrownReq.java
+++ b/src/main/java/emu/grasscutter/server/packet/recv/HandlerSceneEntityDrownReq.java
@@ -8,9 +8,7 @@ import emu.grasscutter.net.packet.PacketOpcodes;
 import emu.grasscutter.net.proto.SceneEntityDrownReqOuterClass.SceneEntityDrownReq;
 import emu.grasscutter.net.proto.VisionTypeOuterClass;
 import emu.grasscutter.server.game.GameSession;
-import emu.grasscutter.server.packet.send.PacketAvatarChangeCostumeRsp;
 import emu.grasscutter.server.packet.send.PacketLifeStateChangeNotify;
-import emu.grasscutter.server.packet.send.PacketSceneEntityDisappearNotify;
 import emu.grasscutter.server.packet.send.PacketSceneEntityDrownRsp;
 
 @Opcodes(PacketOpcodes.SceneEntityDrownReq)
diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketSceneEntityDrownRsp.java b/src/main/java/emu/grasscutter/server/packet/send/PacketSceneEntityDrownRsp.java
index 2918c2f66..4d3a2b232 100644
--- a/src/main/java/emu/grasscutter/server/packet/send/PacketSceneEntityDrownRsp.java
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketSceneEntityDrownRsp.java
@@ -1,4 +1,20 @@
 package emu.grasscutter.server.packet.send;
 
-public class PacketSceneEntityDrownReq {
+import emu.grasscutter.game.entity.GenshinEntity;
+import emu.grasscutter.net.packet.GenshinPacket;
+import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.proto.SceneEntityDrownRspOuterClass.SceneEntityDrownRsp;
+import emu.grasscutter.net.proto.VisionTypeOuterClass.VisionType;
+
+public class PacketSceneEntityDrownRsp extends GenshinPacket {
+
+    public PacketSceneEntityDrownRsp(int entityId) {
+        super(PacketOpcodes.SceneEntityDrownRsp);
+
+        SceneEntityDrownRsp proto = new SceneEntityDrownRsp().toBuilder().setEntityId(entityId).build();
+
+        this.setData(proto);
+    }
 }
+
+

From 31f617e7f0a0c034c6b64f53318257fbba1477f0 Mon Sep 17 00:00:00 2001
From: TheLostTree <65834918+TheLostTree@users.noreply.github.com>
Date: Sat, 23 Apr 2022 03:32:18 -0700
Subject: [PATCH 3/3] Update Grasscutter-Protos

---
 Grasscutter-Protos | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Grasscutter-Protos b/Grasscutter-Protos
index 0537e9cc4..dd17415b7 160000
--- a/Grasscutter-Protos
+++ b/Grasscutter-Protos
@@ -1 +1 @@
-Subproject commit 0537e9cc4c7856a7c6f88bbbaa908a80c4ee677e
+Subproject commit dd17415b71dfcff049e72dbe8a76173611f4b0ae