Grasscutters/Grasscutter
3
0
Fork 0
mirror of https://github.com/Melledy/Grasscutter.git synced 2024-11-25 20:56:28 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #152 from Grasscutters/revert-151-main

Browse Source 
Revert "Drowning packets handled"
This commit is contained in:
Melledy 2022-04-23 04:37:26 -07:00 committed by GitHub
commit 283e92dac6
3 changed files with 1 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Grasscutter-Protos

@ -1 +1 @@
Subproject commit dd17415b71dfcff049e72dbe8a76173611f4b0ae Subproject commit 0537e9cc4c7856a7c6f88bbbaa908a80c4ee677e

41
src/main/java/emu/grasscutter/server/packet/recv/HandlerSceneEntityDrownReq.java
View File

@ -1,41 +0,0 @@
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.PacketLifeStateChangeNotify;
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);
}
}

20
src/main/java/emu/grasscutter/server/packet/send/PacketSceneEntityDrownRsp.java
View File

@ -1,20 +0,0 @@
package emu.grasscutter.server.packet.send;
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);
}
}