Mirror/Grasscutter
1
0
Fork 0
mirror of https://github.com/Grasscutters/Grasscutter.git synced 2025-12-18 09:54:59 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'development' into api

Browse Source 
# Conflicts:
#	src/main/java/emu/grasscutter/plugin/api/ServerHook.java
This commit is contained in:
KingRainbow44
2022-04-27 14:05:34 -04:00
parent 47d8fd3c43 f0d728b4e3
commit d32f706cf3
309 changed files with 3840 additions and 1647 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/main/java/emu/grasscutter/server/event/game/SendPacketEvent.java
View File

@@ -1,15 +1,15 @@
package emu.grasscutter.server.event.game;
import emu.grasscutter.net.packet.GenshinPacket;
import emu.grasscutter.net.packet.BasePacket;
import emu.grasscutter.server.event.Cancellable;
import emu.grasscutter.server.event.ServerEvent;
import emu.grasscutter.server.game.GameSession;
public final class SendPacketEvent extends ServerEvent implements Cancellable {
private final GameSession gameSession;
private GenshinPacket packet;
private BasePacket packet;
public SendPacketEvent(GameSession gameSession, GenshinPacket packet) {
public SendPacketEvent(GameSession gameSession, BasePacket packet) {
super(Type.GAME);
this.gameSession = gameSession;
@@ -20,11 +20,11 @@ public final class SendPacketEvent extends ServerEvent implements Cancellable {
return this.gameSession;
}
public void setPacket(GenshinPacket packet) {
public void setPacket(BasePacket packet) {
this.packet = packet;
}
public GenshinPacket getPacket() {
public BasePacket getPacket() {
return this.packet;
}
}