Akkariin/Grasscutter
1
0
Fork 0
mirror of https://github.com/Grasscutters/Grasscutter.git synced 2026-05-28 01:59:50 +08:00
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev-4.0' into dev-4.0

Browse Source 
# Conflicts:
#	src/main/java/emu/grasscutter/game/player/Player.java
#	src/main/java/emu/grasscutter/game/player/TeamManager.java
#	src/main/java/emu/grasscutter/game/world/Scene.java
This commit is contained in:
KingRainbow44
2023-08-31 21:06:13 -04:00
Unverified
parent 9295d79bc2 e8f4949836
commit 541433c01b
82 changed files with 2394 additions and 1075 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/emu/grasscutter/server/http/dispatch/RegionHandler.java
+1 -1
View File
@@ -267,7 +267,7 @@ public final class RegionHandler implements Router {
.setRegionInfo(RegionInfo.newBuilder())
.setStopServer(
StopServerInfo.newBuilder()
.setUrl("https://discord.gg/grasscutters")
.setUrl("https://discord.gg/T5vZU6UyeG")
.setStopBeginTime((int) Instant.now().getEpochSecond())
.setStopEndTime((int) Instant.now().getEpochSecond() + 1)
.setContentMsg(