Merge branch 'development' into api

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

Merge branch 'development' into api
# Conflicts: # src/main/java/emu/grasscutter/plugin/api/ServerHook.java
d32f706c · KingRainbow44 · 47d8fd3c · f0d728b4 · d32f706c · d32f706c
Commit d32f706c authored Apr 27, 2022 by KingRainbow44
--- a/src/main/java/emu/grasscutter/server/packet/send/PacketPlayerEnterSceneInfoNotify.java
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketPlayerEnterSceneInfoNotify.java
--- a/src/main/java/emu/grasscutter/server/packet/send/PacketPlayerEnterSceneNotify.java
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketPlayerEnterSceneNotify.java
--- a/src/main/java/emu/grasscutter/server/packet/send/PacketPlayerGameTimeNotify.java
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketPlayerGameTimeNotify.java
--- a/src/main/java/emu/grasscutter/server/packet/send/PacketPlayerGetForceQuitBanInfoRsp.java
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketPlayerGetForceQuitBanInfoRsp.java
--- a/src/main/java/emu/grasscutter/server/packet/send/PacketPlayerLevelRewardUpdateNotify.java
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketPlayerLevelRewardUpdateNotify.java
--- a/src/main/java/emu/grasscutter/server/packet/send/PacketPlayerLoginRsp.java
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketPlayerLoginRsp.java
--- a/src/main/java/emu/grasscutter/server/packet/send/PacketPlayerPropNotify.java
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketPlayerPropNotify.java
--- a/src/main/java/emu/grasscutter/server/packet/send/PacketPlayerSetPauseRsp.java
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketPlayerSetPauseRsp.java
--- a/src/main/java/emu/grasscutter/server/packet/send/PacketPlayerStoreNotify.java
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketPlayerStoreNotify.java
--- a/src/main/java/emu/grasscutter/server/packet/send/PacketPlayerTimeNotify.java
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketPlayerTimeNotify.java
--- a/src/main/java/emu/grasscutter/server/packet/send/PacketPostEnterSceneRsp.java
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketPostEnterSceneRsp.java
--- a/src/main/java/emu/grasscutter/server/packet/send/PacketPrivateChatNotify.java
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketPrivateChatNotify.java
--- a/src/main/java/emu/grasscutter/server/packet/send/PacketProudSkillChangeNotify.java
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketProudSkillChangeNotify.java
--- a/src/main/java/emu/grasscutter/server/packet/send/PacketProudSkillExtraLevelNotify.java
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketProudSkillExtraLevelNotify.java
--- a/src/main/java/emu/grasscutter/server/packet/send/PacketPullPrivateChatRsp.java
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketPullPrivateChatRsp.java
--- a/src/main/java/emu/grasscutter/server/packet/send/PacketPullRecentChatRsp.java
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketPullRecentChatRsp.java
--- a/src/main/java/emu/grasscutter/server/packet/send/PacketReliquaryUpgradeRsp.java
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketReliquaryUpgradeRsp.java
--- a/src/main/java/emu/grasscutter/server/packet/send/PacketSceneAreaWeatherNotify.java
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketSceneAreaWeatherNotify.java
--- a/src/main/java/emu/grasscutter/server/packet/send/PacketSceneEntityAppearNotify.java
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketSceneEntityAppearNotify.java
--- a/src/main/java/emu/grasscutter/server/packet/send/PacketSceneEntityDisappearNotify.java
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketSceneEntityDisappearNotify.java