Commit Graph

207 Commits

Author SHA1 Message Date
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
Melledy
686aed2cd4
Merge pull request #77 from xmplay/patch-1
bring back the jade chamber and other old scene tags
2022-04-21 09:01:43 -07:00
Melledy
781448518d
Merge pull request #79 from zamlty/development
Fix artifact & weapon generation by give command
2022-04-21 09:00:30 -07: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
Jaida Wu
dee3105763
Add list command
Signed-off-by: Jaida Wu <mlgmxyysd@meowcat.org>
2022-04-21 22:55:32 +08:00
Benjamin Elsdon
63e008cbcf DatabaseManager clean up 2022-04-21 22:50:06 +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
zamlty
1d54084317 Fix artifact & weapon generation by give command 2022-04-21 22:21:39 +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
Melledy
e10d554db8
Merge pull request #69 from Grasscutters/dev-fixes
Dev fixes
2022-04-21 00:09:12 -07:00
KingRainbow44
cc231b812d
why is Account#onLoad THE DAMN REASON FOR HOURS OF TESTING 2022-04-21 02:07:05 -04:00
Benjamin Elsdon
75719c5b3b Restructured the config file in preperation for server run modes 2022-04-21 13:53:50 +08:00
Melledy
ea91276736
Merge pull request #66 from labalityowo/development
Remove stella constellation appeareance in gacha pull
2022-04-20 22:09:56 -07:00
Melledy
262ca08679
Merge pull request #65 from fengyuecanzhu/development
args check for setstats command
2022-04-20 22:05:58 -07:00
Melledy
75cea5bc48 More refactoring (player id -> player uid) 2022-04-20 21:50:33 -07:00
fengyuecanzhu
9c136859eb add args check 2022-04-21 12:49:23 +08:00
labalityowo
7b43e9a6d8
Remove the stella appearance 2022-04-21 11:42:21 +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
KingRainbow44
c3da897e01
Fix command detection 2022-04-20 23:56:27 -04:00
fengyuecanzhu
56ee7b719a change description 2022-04-21 11:52:53 +08:00
fengyuecanzhu
636d9ff206 add description and permission to setstats command 2022-04-21 11:43:31 +08:00
Yazawazi
639eba528f
folder check 2022-04-21 10:37:24 +08: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
KingRainbow44
d7ffcd1636
Update Morphia to 2.x 2022-04-20 21:11:57 -04:00
KingRainbow44
48ee0be3a9
Fix merge conflict 2022-04-20 18:55:01 -04:00
KingRainbow44
6be98b61e4
Magix sanity. 2022-04-20 18:48:24 -04:00
Melledy
c1df3d1ed8
Merge pull request #60 from Yazawazi/development
Adding a `Teleport to Waypoint` Function
2022-04-20 14:31:14 -07:00
Yazawazi
48cb32f280
session send sorry 2022-04-21 04:59:42 +08:00
Yazawazi
d3bb409360
rsp sorry 2022-04-21 04:51:45 +08:00
alt3ri
8d4d4a3203
Added Elemental Bonus
Usage: /stats <epyro | ecryo | ehydro | egeo | edend | eelec | ephys> <amount> for elemental bonus
2022-04-21 03:47:17 +07:00
Yazawazi
eb6bb1da07
teleports 2022-04-21 04:45:38 +08:00
alt3ri
49475a92dd
Adding Elemental DMG Bonus
Added Elemental DMG Bonus command. 
> /stats <epyro | ecryo | ehydro | egeo | edend | eelec | ephys> <amount>
2022-04-21 03:43:57 +07: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
26c0fc3e7b Reload command now reloads gacha config (again) 2022-04-21 00:28:14 +08: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
Jaida Wu
726f03e510
Add setstats command
Signed-off-by: Jaida Wu <mlgmxyysd@meowcat.org>
2022-04-20 21:15:37 +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
343acc8c6f
Add restart command
Signed-off-by: Jaida Wu <mlgmxyysd@meowcat.org>
2022-04-20 21:06:59 +08:00
Jaida Wu
44d0adea89
Correct pos usage
Signed-off-by: Jaida Wu <mlgmxyysd@meowcat.org>
2022-04-20 21:04:09 +08:00
Jaida Wu
0dabb4c7c2
Add weather command
Signed-off-by: Jaida Wu <mlgmxyysd@meowcat.org>
2022-04-20 21:03:30 +08:00
Jaida Wu
f898795c11
Add pos command
Signed-off-by: Jaida Wu <mlgmxyysd@meowcat.org>
2022-04-20 20:58:57 +08:00
Jaida Wu
87c7fba2d2
Save account to database
Signed-off-by: Jaida Wu <mlgmxyysd@meowcat.org>
2022-04-20 20:56:22 +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
99adb2c54b
Merge pull request #44 from Yazawazi/main
Add /weather Command
2022-04-20 04:50:48 -07:00
alt3ri
a507172d81
Replace SetHealth -> SetStats
Now you can set basic stats of your current character, but I left a little notice: Input and In-game output (character stats) are not really accurate. So to get an accurate stat:

For HP, ATK , DEF, Elemental Mastery (EM): input less than 10 digits. Example: /stats atk 81923 (81293 ATK)
For Energy Recharge (ER), Crit Rate, Crit DMG: input less than 6 digits(0-99999) to get the game current format. Example: /stats cdmg 14236 (142.4% Crit DMG)
(!) The modified stats will be set to default after you logged out.

Press F to pay respect to SetHealth (2022 - 2022)
2022-04-20 18:24:32 +07:00
Yazawazi
31d89369c4
Merge branch 'development' into main 2022-04-20 19:09:48 +08:00
Melledy
cfb13acb7d Fix character abilities not showing for others in co-op/lasting too long 2022-04-20 03:42:59 -07:00
alt3ri
1e7d537965
Adding /pos
Some people want to get the coordinate, here you go!
2022-04-20 17:40:26 +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
149ebaabdb /reload now reloads the gacha as well 2022-04-20 17:17:59 +08:00
Melledy
2f90946da5
Merge pull request #40 from Grasscutters/auto-account
Create the account if it doesn't exist on the login screen
2022-04-20 02:17:21 -07:00
Yazawazi
51e1afefba
Add /weather Command 2022-04-20 17:16:21 +08:00
Benjamin Elsdon
ba56ccff1e Out of my madness and suffering I have achieved the impossible. I almost lost all hope and was about to end it all. However, it worked out in the end and now we have gacha reloading. 2022-04-20 17:14:07 +08:00
Benjamin Elsdon
a498b81a24 Forgot config check 2022-04-20 16:07:18 +08:00
Benjamin Elsdon
c08a341b20 Update gradle + Work gacha reload (gs broken atm) 2022-04-20 16:05:53 +08:00
memetrollsXD
98a86f6946
Merge branch 'development' into restart-command 2022-04-20 09:03:18 +02:00
memetrollsXD
b142be953f
Fix merge conflict 2022-04-20 09:00:50 +02:00
memetrollsXD
2a4c08f59f It won't get better than this for now.. 2022-04-20 08:52:47 +02:00
w4123
10f98cf13c Implement stub NpcTalk packets 2022-04-20 12:25:38 +08:00
KingRainbow44
9f2cf00b95
totally not me forgetting how this works 2022-04-20 00:15:37 -04:00
KingRainbow44
7485e9fd4e
Change to String#equals 2022-04-20 00:10:43 -04: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
KingRainbow44
85801df482
Small updates to server commands 2022-04-19 14:11:48 -04:00
Magix
40c6824cdc
Merge branch 'main' into main 2022-04-19 14:07:39 -04:00
memetrollsXD
1422e20bb3 Try PlayerTokenRsp instead of LoginRsp 2022-04-19 19:45:39 +02:00
memetrollsXD
42260f68a8 WIP Restart command - For now disconnects session, preferrably just send PlayerLoginRsp so it does the login sequence all over again 2022-04-19 19:39:54 +02:00
ayy lmao
eb232f0435 Fix folder seperators 2022-04-19 19:21:14 +03:00
Melledy
1e3d2a04c1
Merge pull request #26 from Yazawazi/main
unlockAvatarConstellation fix
2022-04-19 09:18:42 -07:00
Melledy
ed7df5b711
Merge pull request #27 from OtakuNekoP/main
skip beta server device id verify
2022-04-19 09:09:17 -07:00
Melledy
0e104f00bf
Merge pull request #25 from xmplay/main
add water to golden apple archipelago by default
2022-04-19 09:08:58 -07:00
KingRainbow44
4b68031019
Attempt to fix !givechar 2022-04-19 10:31:24 -04:00
KingRainbow44
ffbd606414
Command reformat 2022-04-19 10:00:50 -04:00
OtakuNekoP
58a2cc26f1
skip beta server device id verify 2022-04-19 14:48:03 +02:00
Benjamin Elsdon
d2ef8a4b49 Fixed an issue with kicking players
(Still broken but now it actually disconnects the player)
2022-04-19 20:36:15 +08:00
Yazawazi
d97b2e834a
talentData
sorry again, forgot to add
2022-04-19 20:05:45 +08:00
xmplay
3639906857
Update PacketPlayerEnterSceneNotify.java 2022-04-19 13:03:43 +01:00
Yazawazi
e69b08b7c0
Constellation fix 2022-04-19 19:48:26 +08:00
Benjamin Elsdon
ca4cb2b7a8 Merge remote-tracking branch 'upstream/main' 2022-04-19 19:34:02 +08:00