Commit Graph

174 Commits

Author SHA1 Message Date
Benjamin Elsdon
a2069c0084 Merge remote-tracking branch 'upstream/development' into dev-mail 2022-04-26 11:59:16 +08:00
Benjamin Elsdon
a5677a8e34 Improvements and send all mail fix
Mail ID no longer exists and is handled by it's position in the mail array
2022-04-26 11:57:55 +08:00
Melledy
b2f1142116 Add getter for DispatchServer's HttpServer 2022-04-25 14:34:37 -07:00
Melledy
2228332f9d Call checkSpawns from World instead of from Player 2022-04-25 14:28:45 -07:00
Melledy
711e6eabd0 Natural spawn test
(without luas)
2022-04-25 14:28:44 -07:00
Magix
dce13cf6af Merge branch 'development' into plugin-system 2022-04-25 17:08:18 -04:00
Benjamin Elsdon
c68c75e8ce Send Mail Command!
Almost done! Wooooo!
2022-04-25 21:53:10 +08:00
Benjamin Elsdon
e30352a667 Forgot to implement levels into GetMailItemRsp
Also added promoteLevels
2022-04-25 16:42:56 +08:00
Benjamin Elsdon
c4de030496 Added ChangeMailStarNotify (change importance level) 2022-04-25 16:23:23 +08:00
Benjamin Elsdon
8d427f2317 Mail read notify 2022-04-25 16:23:23 +08:00
Benjamin Elsdon
67b4c274ec Deleting mail + a bit of cleanup 2022-04-25 16:23:22 +08:00
Benjamin Elsdon
9bf94f9539 Receiving items in mail 2022-04-25 16:22:13 +08:00
Benjamin Elsdon
a548fe6c52 THE MAILBOX ACTUALLY WORKS CORRECTLY NOW 2022-04-25 16:22:12 +08:00
Benjamin Elsdon
69779a0321 Added database support for mail
Send mail command now works from console (to use it from console change the uuid in the 'SendMailCommand' file
2022-04-25 16:22:12 +08:00
Benjamin Elsdon
e24de95d29 Added GetMailItemReq/Rsp & PacketMailChangeNotify
Mail still doesn't work for whatever reason. I also added a temporary SendMailCommand just to receive PacketMailChangeNotify.
I feel like I'm about to lose my mind.
2022-04-25 16:18:23 +08:00
Benjamin Elsdon
346652cf5b Initial work on mail 2022-04-25 16:18:23 +08:00
Melledy
d9e1ed5083 Merge branch 'stable' into development 2022-04-25 00:58:53 -07:00
Asnxthaony
4e5d72a99a sanity check 2022-04-25 00:54:11 -07:00
Asnxthaony
122568ad27 fix SetPlayerBirthdayRsp 2022-04-25 00:54:11 -07:00
alangy98
21b3ac103a Revert "bugfix: portbind error when falling back to http server"
This reverts commit 4817ed9c52.
the bugfix is inappropriate
2022-04-24 17:57:18 -07:00
Alangy
4817ed9c52 bugfix: portbind error when falling back to http server 2022-04-24 23:05:08 +08:00
Melledy
929bb38f2e Merge pull request #180 from Yazawazi/development
Fix the property prompt issue in fetter system
2022-04-24 07:21:34 -07:00
Melledy
edd0bccf5a Merge pull request #167 from memetrollsXD/development
Try to fix "No SSL cert found bind exception"
2022-04-24 07:16:05 -07:00
memetrollsXD
8066b16417 Add .vscode to gitignore and use @fumbling644o's implementation 2022-04-24 12:24:41 +02:00
Yazawazi
8d8866aa63 Fix fetter system 2022-04-24 15:02:31 +08:00
Yazawazi
56a1ab64ab Player Level Reward Update Notify Support! 2022-04-24 13:22:26 +08:00
Yazawazi
b2840b1740 Player level reward 2022-04-24 11:25:13 +08:00
memetrollsXD
79d646d358 Remove last catch and init another variable as placeholder 2022-04-24 04:50:22 +02:00
memetrollsXD
bed3181252 Forgot the toCharArray 2022-04-24 04:41:06 +02:00
memetrollsXD
2045dd2832 Notify user that new pw was used 2022-04-24 04:36:11 +02:00
memetrollsXD
8f81195336 Try to fix "No SSL cert found bind exception" 2022-04-24 04:34:17 +02:00
Yazawazi
3baef42aac Name Card Done!!!!!!!!!!! 2022-04-23 23:48:06 +08:00
Yazawazi
ad1c3f9a3b Will 2022-04-23 22:16:59 +08:00
Yazawazi
3bc249f042 Try to give name card 2022-04-23 21:03:29 +08:00
Yazawazi
042bdc2ff2 Merge branch 'Grasscutters:development' into development 2022-04-23 19:58:17 +08:00
Melledy
9fab2682ee Merge pull request #153 from TheLostTree/main
Handle drowning
2022-04-23 04:39:02 -07:00
Melledy
16a7c9dd67 Revert "Drowning packets handled" 2022-04-23 04:36:34 -07:00
TheLostTree
3d9b71dc4d git doesnt like me 2022-04-23 03:32:08 -07:00
TheLostTree
91894380cb drowning added 2022-04-23 03:19:33 -07:00
KingRainbow44
8afcc0b89a Add message for bind failure (HTTP) 2022-04-23 02:20:18 -04:00
KingRainbow44
832c460a83 Implement packet send/receive events 2022-04-23 02:08:31 -04:00
KingRainbow44
600decbc09 Implement region events 2022-04-23 01:59:06 -04:00
KingRainbow44
6056e962d6 Implement an event handler 2022-04-23 01:58:37 -04:00
KingRainbow44
3ba8c42b42 Merge origin/development into plugin-system 2022-04-23 00:55:31 -04:00
Melledy
02c852716a Merge pull request #136 from miyucchi/development
Save birthday date
2022-04-22 21:35:58 -07:00
Melledy
3ed6a99445 Merge pull request #127 from yarik0chka/development
Implemented sitting
2022-04-22 21:34:36 -07:00
Yazawazi
b11009f724 Merge branch 'Grasscutters:development' into development 2022-04-23 10:43:27 +08:00
Miyucchi
539970fd50 Feature: SetBirthdayDate 2022-04-23 03:29:08 +02:00
Miyucchi
7fd0b371d0 Profile set birthday feature 2022-04-23 03:22:32 +02:00
Yazawazi
7ccecda07c AvatarFetterLevelReward 2022-04-23 06:08:37 +08:00
yarik0chka
3ca181e76d Implemented sitting 2022-04-22 23:24:51 +05:00
4605c6506e Add PublicPort field to server 2022-04-23 01:42:04 +08:00
Yazawazi
48db644692 command fix 2022-04-23 01:36:48 +08:00
104d10352b Add PublicPort field to Dispatch server 2022-04-23 01:16:55 +08:00
Jaida Wu
e02917a527 Add FrontHTTPS field to Dispatch server
Signed-off-by: Jaida Wu <mlgmxyysd@meowcat.org>
2022-04-22 21:25:58 +08:00
Melledy
16318b3793 Merge pull request #74 from 4Benj/development
Server run modes and multi-server dispatch support
2022-04-21 15:06:57 -07:00
Melledy
4431469334 Merge pull request #84 from yarik0chka/development
Add a changing weather id
2022-04-21 11:47:13 -07:00
Yazawazi
069cb1c6d3 Teleport Small Fix 2022-04-22 02:23:02 +08:00
yarik0chka
0480f10a1a Add a changing weather id 2022-04-21 22:21:24 +05:00
Benjamin Elsdon
23caf994c7 Forgot a dispatch prefix on error while merging 2022-04-22 01:15:05 +08:00
Benjamin Elsdon
9eca5123a5 Merge remote-tracking branch 'upstream/development' into development 2022-04-22 01:04:03 +08:00
Melledy
0e7976f906 Merge pull request #78 from MlgmXyysd/dispatch-refactor
Refact dispatch server
2022-04-21 09:03:53 -07:00
Jaida Wu
d11413c017 Add dispatch server log prefix
Signed-off-by: Jaida Wu <mlgmxyysd@meowcat.org>
2022-04-22 00:02:02 +08:00
Jaida Wu
1143886b09 Add some log to dispatch server
Signed-off-by: Jaida Wu <mlgmxyysd@meowcat.org>
2022-04-22 00:02:00 +08:00
Jaida Wu
12674f6cec 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
23226ad464 Refact code
Signed-off-by: Jaida Wu <mlgmxyysd@meowcat.org>
2022-04-22 00:01:54 +08:00
Benjamin Elsdon
beb8675190 Should probably remove this as well... 2022-04-21 23:04:02 +08:00
Benjamin Elsdon
2c509237a5 Removed class left over from testing 2022-04-21 23:00:36 +08:00
Benjamin Elsdon
77fcce6510 Fixed null pointer exception in game only mode
PacketPlayerLoginRsp now creates the required QuerryCurrRegionHttpRsp itself.
2022-04-21 22:38:01 +08:00
xmplay
77b33377d8 bring back the jade chamber and other old scene tags 2022-04-21 15:04:47 +01:00
Jaida Wu
e242e72b2d Drop independent log server
Signed-off-by: Jaida Wu <mlgmxyysd@meowcat.org>
2022-04-21 21:41:30 +08:00
Benjamin Elsdon
1275592747 Fixed null pointer exception in hybrid mode. 2022-04-21 19:20:49 +08:00
Benjamin Elsdon
1500d2e885 Merge branch 'development' of https://github.com/Melledy/Grasscutter into development 2022-04-21 18:11:51 +08:00
Benjamin Elsdon
9ce436022d Multi-server dispatch support and server run modes 2022-04-21 18:04:00 +08:00
Melledy
4c1dc34c1f Merge pull request #70 from Grasscutters/dev-fixes
Dev fixes
2022-04-21 00:31:01 -07:00
Melledy
bc07fa77b2 Make sure SetEntityClientDataNotify is a valid proto before replaying it to the other players 2022-04-21 00:29:06 -07:00
Melledy
29f6d77e2f Add config entry for OverseaLogPort (default: 8888) 2022-04-21 00:28:28 -07:00
Benjamin Elsdon
83fe5818dc Restructured the config file in preperation for server run modes 2022-04-21 13:53:50 +08:00
Melledy
af1ecca963 More refactoring (player id -> player uid) 2022-04-20 21:50:33 -07:00
Melledy
b99ca4e02f Refactor PacketSceneTransToPointRsp and add a null check when getting ScenePointEntries 2022-04-20 21:33:58 -07:00
Melledy
1250194480 Fix weapon skills (and artifact sets) not working when you equip them 2022-04-20 21:03:18 -07:00
Melledy
8a8906098e Fix not being able to join friend's world 2022-04-20 18:48:26 -07:00
Melledy
7f2de4fab8 Fix player location updates in co-op 2022-04-20 18:44:02 -07:00
Melledy
b9876fc056 Fix water and the visual map in archipelago 2022-04-20 18:37:07 -07:00
Yazawazi
ec438dc16e session send sorry 2022-04-21 04:59:42 +08:00
Yazawazi
6f43c0765f teleports 2022-04-21 04:45:38 +08:00
Melledy
19572f46e3 Merge pull request #55 from memetrollsXD/development
Custom Y position on MarkMapReq
2022-04-20 12:36:42 -07:00
Benjamin Elsdon
41b4965aef Merge remote-tracking branch 'upstream/development' 2022-04-21 00:25:47 +08:00
KingRainbow44
69aa6130e9 Fix command map 2022-04-20 12:17:56 -04:00
memetrollsXD
d5d9056452 Custom Y position on MarkMapReq 2022-04-20 17:55:33 +02:00
Benjamin Elsdon
cb104ac79a Merge branch 'development' of https://github.com/Melledy/Grasscutter 2022-04-20 21:38:59 +08:00
iTruth
de0a14a589 Fix playerOpt is always throw an exception when it's null 2022-04-20 21:14:18 +08:00
Jaida Wu
63cb0a8174 Rewrite commands
Signed-off-by: Jaida Wu <mlgmxyysd@meowcat.org>
2022-04-20 20:21:38 +08:00
Melledy
7fc587e7d6 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
b3db933a16 Merge pull request #41 from w4123/npctalk_patch
Try to implement NpcTalk packets
2022-04-20 04:51:42 -07:00
Melledy
5a09c22aa1 Fix character abilities not showing for others in co-op/lasting too long 2022-04-20 03:42:59 -07:00
Melledy
fda205015b Fix account not found issue when logging in 2022-04-20 03:28:54 -07:00
Benjamin Elsdon
e8601de5d5 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
b7f5cc9748 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
22781ac6e7 Merge branch 'development' of https://github.com/Melledy/Grasscutter 2022-04-20 17:18:51 +08:00