Benjamin Elsdon
ff6958ed1f
Forgot a dispatch prefix on error while merging
2022-04-22 01:15:05 +08:00
Benjamin Elsdon
96da53b5fb
Merge remote-tracking branch 'upstream/development' into development
2022-04-22 01:04:03 +08:00
Melledy
6863600865
Merge pull request #78 from MlgmXyysd/dispatch-refactor
...
Refact dispatch server
2022-04-21 09:03:53 -07:00
Jaida Wu
aacd261206
Add dispatch server log prefix
...
Signed-off-by: Jaida Wu <mlgmxyysd@meowcat.org>
2022-04-22 00:02:02 +08:00
Jaida Wu
b0d2d29b1c
Add some log to dispatch server
...
Signed-off-by: Jaida Wu <mlgmxyysd@meowcat.org>
2022-04-22 00:02:00 +08:00
Jaida Wu
2df8625b24
Fallback to HTTP if no SSL cert
...
Signed-off-by: Jaida Wu <mlgmxyysd@meowcat.org>
2022-04-22 00:01:59 +08:00
Jaida Wu
a1567895fa
Refact code
...
Signed-off-by: Jaida Wu <mlgmxyysd@meowcat.org>
2022-04-22 00:01:54 +08:00
Benjamin Elsdon
66b5ed8a83
Should probably remove this as well...
2022-04-21 23:04:02 +08:00
Benjamin Elsdon
72355dd3c5
Removed class left over from testing
2022-04-21 23:00:36 +08:00
Benjamin Elsdon
a36f29cdf1
Fixed null pointer exception in game only mode
...
PacketPlayerLoginRsp now creates the required QuerryCurrRegionHttpRsp itself.
2022-04-21 22:38:01 +08:00
xmplay
66c956d10e
bring back the jade chamber and other old scene tags
2022-04-21 15:04:47 +01:00
Jaida Wu
65e0799e79
Drop independent log server
...
Signed-off-by: Jaida Wu <mlgmxyysd@meowcat.org>
2022-04-21 21:41:30 +08:00
Benjamin Elsdon
585187bebe
Fixed null pointer exception in hybrid mode.
2022-04-21 19:20:49 +08:00
Benjamin Elsdon
e97e124460
Merge branch 'development' of https://github.com/Melledy/Grasscutter into development
2022-04-21 18:11:51 +08:00
Benjamin Elsdon
6a091b254c
Multi-server dispatch support and server run modes
2022-04-21 18:04:00 +08:00
Melledy
56415b7fbc
Merge pull request #70 from Grasscutters/dev-fixes
...
Dev fixes
2022-04-21 00:31:01 -07:00
Melledy
3a0997bb5a
Make sure SetEntityClientDataNotify is a valid proto before replaying it to the other players
2022-04-21 00:29:06 -07:00
Melledy
c0e859b17c
Add config entry for OverseaLogPort (default: 8888)
2022-04-21 00:28:28 -07:00
Benjamin Elsdon
75719c5b3b
Restructured the config file in preperation for server run modes
2022-04-21 13:53:50 +08:00
Melledy
75cea5bc48
More refactoring (player id -> player uid)
2022-04-20 21:50:33 -07:00
Melledy
35925903a1
Refactor PacketSceneTransToPointRsp and add a null check when getting ScenePointEntries
2022-04-20 21:33:58 -07:00
Melledy
252fa6b958
Fix weapon skills (and artifact sets) not working when you equip them
2022-04-20 21:03:18 -07:00
Melledy
434573115c
Fix not being able to join friend's world
2022-04-20 18:48:26 -07:00
Melledy
268a0f94ce
Fix player location updates in co-op
2022-04-20 18:44:02 -07:00
Melledy
eb466ffec0
Fix water and the visual map in archipelago
2022-04-20 18:37:07 -07:00
Yazawazi
48cb32f280
session send sorry
2022-04-21 04:59:42 +08:00
Yazawazi
eb6bb1da07
teleports
2022-04-21 04:45:38 +08:00
Melledy
c48eebbd86
Merge pull request #55 from memetrollsXD/development
...
Custom Y position on MarkMapReq
2022-04-20 12:36:42 -07:00
Benjamin Elsdon
094674124e
Merge remote-tracking branch 'upstream/development'
2022-04-21 00:25:47 +08:00
KingRainbow44
6710f04b71
Fix command map
2022-04-20 12:17:56 -04:00
memetrollsXD
e80a14b7dc
Custom Y position on MarkMapReq
2022-04-20 17:55:33 +02:00
Benjamin Elsdon
8a3af10162
Merge branch 'development' of https://github.com/Melledy/Grasscutter
2022-04-20 21:38:59 +08:00
iTruth
11ca0cd735
Fix playerOpt is always throw an exception when it's null
2022-04-20 21:14:18 +08:00
Jaida Wu
c42d6d81f6
Rewrite commands
...
Signed-off-by: Jaida Wu <mlgmxyysd@meowcat.org>
2022-04-20 20:21:38 +08:00
Melledy
337ed4c197
Merge pull request #49 from Grasscutters/dev-abilities
...
Fix character abilities not showing for others in co-op/lasting too long
2022-04-20 05:15:32 -07:00
Melledy
e8112065ad
Merge pull request #41 from w4123/npctalk_patch
...
Try to implement NpcTalk packets
2022-04-20 04:51:42 -07:00
Melledy
cfb13acb7d
Fix character abilities not showing for others in co-op/lasting too long
2022-04-20 03:42:59 -07:00
Melledy
968693b84d
Fix account not found issue when logging in
2022-04-20 03:28:54 -07:00
Benjamin Elsdon
7bca4e4c30
Added OnGameServerStartFinish EventBus
...
Removed those temporary warning messages as I figured out how to disable them
2022-04-20 17:44:44 +08:00
Benjamin Elsdon
c15fc9b6fc
Added OnGameServerStop EventBus
...
There is a temporary warning message telling users to ignore the 'No subscribers registered' error. This can be removed once things actually subscribe to it
2022-04-20 17:31:41 +08:00
Benjamin Elsdon
93ae8742c0
Merge branch 'development' of https://github.com/Melledy/Grasscutter
2022-04-20 17:18:51 +08:00
Benjamin Elsdon
c08a341b20
Update gradle + Work gacha reload (gs broken atm)
2022-04-20 16:05:53 +08:00
w4123
10f98cf13c
Implement stub NpcTalk packets
2022-04-20 12:25:38 +08:00
KingRainbow44
c0155b8dcc
Add config option
2022-04-20 00:10:32 -04:00
KingRainbow44
50e630b1fa
Automatically create account on login screen
2022-04-20 00:03:01 -04:00
Melledy
ed7df5b711
Merge pull request #27 from OtakuNekoP/main
...
skip beta server device id verify
2022-04-19 09:09:17 -07:00
OtakuNekoP
58a2cc26f1
skip beta server device id verify
2022-04-19 14:48:03 +02:00
xmplay
3639906857
Update PacketPlayerEnterSceneNotify.java
2022-04-19 13:03:43 +01:00
Melledy
b9c69408f9
Remove duplicate function and fix stackoverflow issue
2022-04-19 04:13:38 -07:00
Melledy
812811c550
Merge branch 'dev-scene'
2022-04-19 04:12:53 -07:00
Melledy
c4ccb298f9
Refactor some commands and move inventory/team limits to the config
2022-04-19 02:22:21 -07:00
naufal
9dc58d8b3b
feat: added configuration for change upload port
...
feat: added configuration for use non SSL
2022-04-19 11:49:08 +07:00
Melledy
efe183ecf7
Fix permissions not saving
2022-04-18 21:38:38 -07:00
Melledy
8af0a70b82
Fix permissions not saving
2022-04-18 21:38:19 -07:00
Melledy
cd81494b8f
Merge branch 'main' into dev-scene
2022-04-18 21:35:01 -07:00
KingRainbow44
27c9545b0d
GameServer#getPlayerByUid = GameServer#getPlayerById
2022-04-18 23:53:05 -04:00
KingRainbow44
f8496a5ea5
Find by player's UID not IID
2022-04-18 22:23:22 -04:00
KingRainbow44
4a70653e88
Refactor method names & add / prefix
2022-04-18 22:16:20 -04:00
KingRainbow44
ce51e9d6c3
Implement new command system
2022-04-18 18:24:08 -04:00
Melledy
06ad1e8f9b
Implement support for multiple scenes in a world
2022-04-18 09:39:29 -07:00
ayy lmao
f3dc5f81ea
Add support for specifying a Public IP
2022-04-18 12:10:39 +03:00
Melledy
c83bec9b9e
Merge branch 'main' of https://github.com/Melledy/Grasscutter
2022-04-17 23:45:08 -07:00
Melledy
26782146e0
Remove gadgets from world when a player leaves
2022-04-17 23:43:47 -07:00
KingRainbow44
54854e5c17
Refactor existing code
2022-04-18 01:11:27 -04:00
Melledy
3b45ff7d46
Initial commit
2022-04-17 05:43:07 -07:00
