Merge branch 'development' into api (d32f706c) · Commits · ziqian zhang / Grasscutter

Commit d32f706c authored 3 years ago by

KingRainbow44

Merge branch 'development' into api

# Conflicts:
#	src/main/java/emu/grasscutter/plugin/api/ServerHook.java

parents 47d8fd3c f0d728b4

No related merge requests found

Hide whitespace changes

Inline Side-by-side

Showing

src/main/java/emu/grasscutter/netty/KcpChannel.java 1 addition, 1 deletion

src/main/java/emu/grasscutter/netty/KcpChannel.java
src/main/java/emu/grasscutter/netty/KcpHandshaker.java 2 additions, 2 deletions

src/main/java/emu/grasscutter/netty/KcpHandshaker.java
src/main/java/emu/grasscutter/netty/KcpServer.java 3 additions, 3 deletions

src/main/java/emu/grasscutter/netty/KcpServer.java
src/main/java/emu/grasscutter/netty/KcpServerInitializer.java 1 addition, 1 deletion

...main/java/emu/grasscutter/netty/KcpServerInitializer.java
src/main/java/emu/grasscutter/plugin/api/PlayerHook.java 11 additions, 11 deletions

src/main/java/emu/grasscutter/plugin/api/PlayerHook.java
src/main/java/emu/grasscutter/server/dispatch/DispatchServer.java 55 additions, 41 deletions

.../java/emu/grasscutter/server/dispatch/DispatchServer.java
src/main/java/emu/grasscutter/server/event/game/SendPacketEvent.java 5 additions, 5 deletions

...va/emu/grasscutter/server/event/game/SendPacketEvent.java
src/main/java/emu/grasscutter/server/game/GameServer.java 35 additions, 21 deletions

src/main/java/emu/grasscutter/server/game/GameServer.java
src/main/java/emu/grasscutter/server/game/GameServerInitializer.java 2 additions, 2 deletions

...va/emu/grasscutter/server/game/GameServerInitializer.java
src/main/java/emu/grasscutter/server/game/GameServerPacketHandler.java 1 addition, 1 deletion

.../emu/grasscutter/server/game/GameServerPacketHandler.java
src/main/java/emu/grasscutter/server/game/GameSession.java 36 additions, 29 deletions

src/main/java/emu/grasscutter/server/game/GameSession.java
src/main/java/emu/grasscutter/server/packet/recv/HandlerAvatarFetterLevelRewardReq.java 7 additions, 8 deletions

...server/packet/recv/HandlerAvatarFetterLevelRewardReq.java
src/main/java/emu/grasscutter/server/packet/recv/HandlerBuyGoodsReq.java 67 additions, 0 deletions

...mu/grasscutter/server/packet/recv/HandlerBuyGoodsReq.java
src/main/java/emu/grasscutter/server/packet/recv/HandlerChangeMailStarNotify.java 34 additions, 0 deletions

...utter/server/packet/recv/HandlerChangeMailStarNotify.java
src/main/java/emu/grasscutter/server/packet/recv/HandlerCombatInvocationsNotify.java 4 additions, 4 deletions

...er/server/packet/recv/HandlerCombatInvocationsNotify.java
src/main/java/emu/grasscutter/server/packet/recv/HandlerCombineReq.java 20 additions, 0 deletions

...emu/grasscutter/server/packet/recv/HandlerCombineReq.java
src/main/java/emu/grasscutter/server/packet/recv/HandlerDelMailReq.java 21 additions, 0 deletions

...emu/grasscutter/server/packet/recv/HandlerDelMailReq.java
src/main/java/emu/grasscutter/server/packet/recv/HandlerEnterSceneDoneReq.java 1 addition, 1 deletion

...sscutter/server/packet/recv/HandlerEnterSceneDoneReq.java
src/main/java/emu/grasscutter/server/packet/recv/HandlerEvtAvatarSitDownNotify.java 1 addition, 1 deletion

...ter/server/packet/recv/HandlerEvtAvatarSitDownNotify.java
src/main/java/emu/grasscutter/server/packet/recv/HandlerGetAllMailReq.java 21 additions, 0 deletions

.../grasscutter/server/packet/recv/HandlerGetAllMailReq.java

with 328 additions and 131 deletions

Please register or to comment