KingRainbow44
03988414ce
Refactor classes
2022-04-26 00:04:03 -04:00
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
614477181f
Fix concurrency related error while spawning monsters
2022-04-25 14:28:45 -07:00
Melledy
2228332f9d
Call checkSpawns from World instead of from Player
2022-04-25 14:28:45 -07:00
Melledy
c3f9fd3ce3
Synchronize scene entity map
2022-04-25 14:28:45 -07:00
Melledy
1c691748f5
Make monsters scale off world level
2022-04-25 14:28:45 -07:00
Melledy
f28f21b061
Dont deregister scenes if the player is going to tp back into them
2022-04-25 14:28:44 -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
b6fedcf262
Support kill from console
2022-04-25 11:01:18 -07:00
dc6702eb5c
Add a new alias to the command killcharacter
2022-04-25 11:01:18 -07:00
00a40a84bb
Add killcharacter command
2022-04-25 11:01:18 -07:00
alt3ri
5dd5f70903
Merged /clearartifacts and /clearweapons
...
I merged ClearArtifactsCommand and ClearWeaponsCommand to ClearCommand with UID parameter. Still no send from console cuz I forgor 💀
Usage: /clear <wp | art | mat | all> [uid]
2022-04-25 11:00:10 -07:00
alt3ri
56eb711055
Delete ClearArtifactsCommand.java
2022-04-25 11:00:10 -07:00
alt3ri
c1ef679e30
Delete ClearWeaponsCommand.java
2022-04-25 11:00:10 -07: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
3f11cc41b2
More weird git stuff
2022-04-25 16:32:26 +08:00
Benjamin Elsdon
b29bcb553a
Weird git stuff
2022-04-25 16:25:33 +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
29a3e64db0
Java-16 compatiable mail system (whoops)
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
Benjamin Elsdon
3787cfad59
Added ChangeMailStarNotify (change importance level)
2022-04-25 16:11:57 +08:00
Melledy
d9e1ed5083
Merge branch 'stable' into development
2022-04-25 00:58:53 -07:00
Asnxthaony
480374fb39
fix indent by using smart tabs
2022-04-25 00:54:11 -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
Benjamin Elsdon
4c7bd69eb0
Mail read notify
2022-04-25 15:41:18 +08:00
BaiSugar
c6bd1fa5d4
remove test avatar
2022-04-25 15:17:55 +08:00
Benjamin Elsdon
721d8b7223
Deleting mail + a bit of cleanup
2022-04-25 14:30:56 +08:00
Benjamin Elsdon
785effe8da
Receiving items in mail
2022-04-25 13:51:19 +08:00
Yan
2238a7c3aa
fix setting electro dmg stat
2022-04-24 17:57:42 -07:00
alangy98
21b3ac103a
Revert "bugfix: portbind error when falling back to http server"
...
This reverts commit 4817ed9c52
2022-04-24 17:57:18 -07:00
alt3ri
4837ccb983
Added UID parameter
...
Now you can delete other player's weapons with UID
Usage: /clearwp [uid]
2022-04-24 17:56:49 -07:00
Yazawazi
5010b8ac75
add setfriendship aliases
2022-04-24 10:32:47 -07:00
Alangy
4817ed9c52
bugfix: portbind error when falling back to http server
2022-04-24 23:05:08 +08:00
BaiSugar
1c15dd3c32
fix
2022-04-24 22:49:33 +08:00
BaiSugar
5eeea84f8e
Corrected format
2022-04-24 22:46:43 +08:00
BaiSugar
885e2d078c
Corrected format
2022-04-24 22:45:30 +08:00
BaiSugar
f3d561cd06
Revert "Corrected format"
...
This reverts commit 60319ee9eb
2022-04-24 22:42:44 +08:00
BaiSugar
60319ee9eb
Corrected format
2022-04-24 22:38:53 +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
BaiSugar
0796957751
Added command to get all items
2022-04-24 21:52:50 +08:00
Benjamin Elsdon
94a75cf903
THE MAILBOX ACTUALLY WORKS CORRECTLY NOW
2022-04-24 19:06:52 +08:00
memetrollsXD
8066b16417
Add .vscode to gitignore and use @fumbling644o's implementation
2022-04-24 12:24:41 +02:00
Benjamin Elsdon
f556bff333
Java-16 compatiable mail system (whoops)
2022-04-24 18:17:08 +08:00
Benjamin Elsdon
c25e809f5c
Merge remote-tracking branch 'upstream/development' into dev-mail
2022-04-24 18:01:32 +08:00
Yazawazi
23f0406b57
command fix too
2022-04-24 15:10:25 +08:00
Yazawazi
5c0c4fe67e
Merge branch 'Grasscutters:development' into development
2022-04-24 15:03:58 +08:00
Melledy
b6d8dd0db4
Merge pull request #175 from omg-xtao/suicide
...
GodMode command supports playerId
2022-04-24 00:03:21 -07:00
Yazawazi
8d8866aa63
Fix fetter system
2022-04-24 15:02:31 +08:00
BaiSugar
02ef9d84c7
Added command to get all items
2022-04-24 14:01:03 +08:00
Yazawazi
56a1ab64ab
Player Level Reward Update Notify Support!
2022-04-24 13:22:26 +08:00
2f5ae6c784
GodMode command supports playerId
2022-04-24 11:40:10 +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
Melledy
81ee9a00a2
Merge pull request #164 from miyucchi/development
...
Fix counter (Create a new account if exists issue)
2022-04-23 15:26:14 -07:00
Melledy
7a4de2f0d6
Merge pull request #128 from memetrollsXD/development
...
Use count for level for equips (dev branch)
2022-04-23 15:15:22 -07:00
Miyucchi
7792c5c73f
Fix counter
2022-04-24 00:10:26 +02:00
Yazawazi
9e523da18e
tp with relative coordinates
2022-04-24 05:20:59 +08:00
Yazawazi
0c4d975409
Merge branch 'Grasscutters:development' into development
2022-04-24 05:03:55 +08:00
memetrollsXD
fd1890b072
Merge branch 'Grasscutters:development' into development
2022-04-23 22:37:48 +02:00
2dd8932144
Add Teleport command
2022-04-24 03:10:07 +08:00
Yazawazi
3baef42aac
Name Card Done!!!!!!!!!!!
2022-04-23 23:48:06 +08:00
Benjamin Elsdon
9e7c9f4670
Merge remote-tracking branch 'upstream/development' into dev-mail
2022-04-23 23:07:38 +08:00
Benjamin Elsdon
cb03b654bc
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-23 23:07:18 +08:00
Yazawazi
ad1c3f9a3b
Will
2022-04-23 22:16:59 +08:00
Yazawazi
aa4489497e
Merge branch 'Grasscutters:development' into development
2022-04-23 22:16:21 +08:00
memetrollsXD
57e3637251
Add promoteLevel and count
2022-04-23 16:11:45 +02:00
301d0a174c
Add another way to set talent level
2022-04-23 21:13:45 +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
Jaida Wu
3eabd40345
Make some control panel happy
...
Signed-off-by: Jaida Wu <mlgmxyysd@meowcat.org>
2022-04-23 16:47:13 +08:00
Melledy
df1dca8d87
Merge pull request #141 from Grasscutters/bind-failure
...
Push a helpful error message to the console on bind failure
2022-04-23 01:14:51 -07:00
Jaida Wu
cd08c52b35
Fix PlayerBirthday exception
...
Signed-off-by: Jaida Wu <mlgmxyysd@meowcat.org>
2022-04-23 15:39:56 +08: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
7a3fbcdcf7
Plugin enabling & disabling
2022-04-23 01:17:35 -04:00
KingRainbow44
3ba8c42b42
Merge origin/development into plugin-system
2022-04-23 00:55:31 -04:00
KingRainbow44
15da839503
Update Grasscutter for Java 16 & Plugins
2022-04-23 00:53:11 -04:00
Melledy
a957379afb
Merge pull request #131 from Raeliana/patch-1
...
Create ClearWeaponsCommand.java
2022-04-22 21:36:52 -07: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
Magix
0992fc11b4
Add keystore password
2022-04-22 23:53:37 -04:00
Yazawazi
5ea5ea238c
OpenCond for unlocking judgment
2022-04-23 10:51:22 +08:00
Yazawazi
b11009f724
Merge branch 'Grasscutters:development' into development
2022-04-23 10:43:27 +08:00
Melledy
716380a078
Merge branch 'development' into java-16
2022-04-22 19:23:32 -07:00
KingRainbow44
e3d6b86dd9
Basic plugin manager
2022-04-22 21:45:44 -04: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
KingRainbow44
1a056d2d13
Move manifest to resources
2022-04-22 20:42:55 -04:00
Raeliana
cdf6c697f1
Create ClearWeaponsCommand.java
...
A command to clear unlocked and unequipped artifacts
2022-04-23 02:48:04 +03:00
Melledy
dffffc8d49
Merge branch 'stable' into development
2022-04-22 16:34:41 -07:00
Yazawazi
7ccecda07c
AvatarFetterLevelReward
2022-04-23 06:08:37 +08:00
memetrollsXD
a52eaf9bbc
Use count for level for equips
2022-04-22 23:19:58 +02:00
PasserbyAlpha
6cc0fdaeed
use OutputStreamWriter to ensure the charset of output is utf8 [from fumbling644o]
2022-04-23 02:28:34 +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
Yazawazi
eb70904660
setfetterlevel command
2022-04-22 23:46:24 +08:00
PasserbyAlpha
68218cbb49
fixed encoding problem when generating gm handbook
2022-04-22 23:11:29 +08:00
Yazawazi
159b10af72
AvatarFetterLevel
2022-04-22 22:27:40 +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
9b23bfa556
Revert "Explicitly load and save UTF-8 for the handbook"
...
This reverts commit 215ee2a3b2
2022-04-22 05:20:02 -07:00
Melledy
f4f8a86a8c
Merge pull request #113 from 01101sam/patch-1
...
[typo] Fix resources folder tips
2022-04-22 04:38:04 -07:00
Melledy
acd59d1788
Merge pull request #114 from alt3ri/development
...
Added /talent command
2022-04-22 04:35:10 -07:00
Melledy
95c6b9486d
Merge pull request #108 from fumbling644o/development
...
GM handbook: Explicitly load and save UTF-8
2022-04-22 04:33:05 -07:00
Benjamin Elsdon
a326581efd
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-22 19:02:05 +08:00
alt3ri
63898a18df
Deleted 2 lines
2022-04-22 17:38:58 +07:00
alt3ri
370483fae2
Added /talent command
...
Set current character talent level by using /talent command.
> /talent getid - Gets current character talent ID
> /talent set <talent ID> <level> - Sets current character's talent level
2022-04-22 17:28:52 +07:00
Sam
2aaf70c031
[typo-upd] Add missing folder
2022-04-22 17:43:06 +08:00
Sam
b629e8c652
[typo] Fix resources folder tips
2022-04-22 17:36:24 +08:00
Benjamin Elsdon
04a85d1ebb
Initial work on mail
2022-04-22 15:52:31 +08:00
fumbling
215ee2a3b2
Explicitly load and save UTF-8 for the handbook
...
This fixes potential output issues for non-Latin scripts when exporting the handbook by changing the filename in the code.
2022-04-22 02:32:27 -04:00
Benjamin Elsdon
46b527df4d
Log files
2022-04-22 13:05:06 +08:00
Magix
1cf1a951dd
Merge pull request #94 from Yazawazi/development
...
Try to show characters' stories and voices
2022-04-21 23:12:02 -04:00
Yazawazi
123fc263ba
cache fetters
2022-04-22 10:39:25 +08:00
fumbling
06101f1b9c
Morphia call fixes; add @Entity to more classes
...
1. During the conversion of Morphia calls to the new API, some of the `Filter.eq()` calls had their `field` set to `playerId` due to a copy/paste typo.
2. Morphia 2 switches to the codec system, so anything that will be serialized in the pipeline requires the `@Entity` annotation.
2022-04-21 22:19:47 -04:00
fengyuecanzhu
b31dab04eb
change fhp to heal
2022-04-22 08:45:46 +08:00
Yazawazi
376c668dd9
no more NullPointerException pls
2022-04-22 08:30:02 +08:00
fengyuecanzhu
ff778914cb
remove revive command
2022-04-22 08:26:48 +08:00
fengyuecanzhu
28db79876b
add fullfp command
2022-04-22 08:08:47 +08:00
Yazawazi
2350f0ebe2
ee, forget to change variables when copying from local
2022-04-22 07:49:35 +08:00
Yazawazi
044c2a3086
typo
2022-04-22 07:42:17 +08:00
Yazawazi
eedab79253
fetter try
2022-04-22 07:37:25 +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
04791b68be
Refactor Revive Command + fix syntax error
...
No idea how I missed the syntax error while reviewing
2022-04-21 14:47:04 -07:00
Melledy
e884970ac4
Merge branch 'development' into account-fix
2022-04-21 14:46:07 -07:00
Melledy
58535dd1ce
Save config everytime you load so the new options show up
2022-04-21 14:44:55 -07:00
Melledy
db1c4cd462
Merge pull request #88 from alt3ri/development
...
Added /revive command
2022-04-21 14:05:09 -07:00
Melledy
e10bad5b17
Fix account dupe key error after selecting starting character
2022-04-21 14:02:17 -07:00
