Grasscutters/Grasscutter
3
0
Fork 0
mirror of https://github.com/Melledy/Grasscutter.git synced 2024-11-30 20:56:55 +00:00
Code Issues Projects Releases Wiki Activity
653 Commits 7 Branches 22 Tags 136 MiB
bea9a76895
Commit Graph

434 Commits

Author SHA1 Message Date
Melledy
f29cdd753a
Revert "Drowning packets handled" 2022-04-23 04:36:34 -07:00
TheLostTree
46aded281d git doesnt like me 2022-04-23 03:32:08 -07:00
TheLostTree
d64044f931 drowning added 2022-04-23 03:19:33 -07:00
Jaida Wu
46f40a9012
Make some control panel happy 
Signed-off-by: Jaida Wu <mlgmxyysd@meowcat.org>
 2022-04-23 16:47:13 +08:00
Melledy
ea9cda21e2
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
e38f5ca97b
Fix PlayerBirthday exception 
Signed-off-by: Jaida Wu <mlgmxyysd@meowcat.org>
 2022-04-23 15:39:56 +08:00
KingRainbow44
bba4a00508
Add message for bind failure (HTTP) 2022-04-23 02:20:18 -04:00
KingRainbow44
c31312416a
Implement packet send/receive events 2022-04-23 02:08:31 -04:00
KingRainbow44
c676bb9f08
Implement region events 2022-04-23 01:59:06 -04:00
KingRainbow44
8b34222ceb
Implement an event handler 2022-04-23 01:58:37 -04:00
KingRainbow44
2a6984229e
Plugin enabling & disabling 2022-04-23 01:17:35 -04:00
KingRainbow44
ec6a54ebd7
Merge origin/development into plugin-system 2022-04-23 00:55:31 -04:00
KingRainbow44
9b2e4e3fa9
Update Grasscutter for Java 16 & Plugins 2022-04-23 00:53:11 -04:00
Melledy
90c9af7257
Merge pull request #131 from Raeliana/patch-1 
Create ClearWeaponsCommand.java
 2022-04-22 21:36:52 -07:00
Melledy
473a90432f
Merge pull request #136 from miyucchi/development 
Save birthday date
 2022-04-22 21:35:58 -07:00
Melledy
bdfd92e7a3
Merge pull request #127 from yarik0chka/development 
Implemented sitting
 2022-04-22 21:34:36 -07:00
Magix
1933bfc95a
Add keystore password 2022-04-22 23:53:37 -04:00
Yazawazi
23481cfe0c
OpenCond for unlocking judgment 2022-04-23 10:51:22 +08:00
Yazawazi
eb57534a2a
Merge branch 'Grasscutters:development' into development 2022-04-23 10:43:27 +08:00
Melledy
17abf321a2 Merge branch 'development' into java-16 2022-04-22 19:23:32 -07:00
KingRainbow44
6243c4e6e8
Basic plugin manager 2022-04-22 21:45:44 -04:00
Miyucchi
6d53f2d6ac Feature: SetBirthdayDate 2022-04-23 03:29:08 +02:00
Miyucchi
e2543483ff Profile set birthday feature 2022-04-23 03:22:32 +02:00
KingRainbow44
d6653f03a7
Move manifest to resources 2022-04-22 20:42:55 -04:00
Raeliana
f04f1ec5ce
Create ClearWeaponsCommand.java 
A command to clear unlocked and unequipped artifacts
 2022-04-23 02:48:04 +03:00
Melledy
5c1f48a5aa Merge branch 'stable' into development 2022-04-22 16:34:41 -07:00
Yazawazi
53659d2586
AvatarFetterLevelReward 2022-04-23 06:08:37 +08:00
memetrollsXD
d341e4f245 Use count for level for equips 2022-04-22 23:19:58 +02:00
PasserbyAlpha
2750d5da2d use OutputStreamWriter to ensure the charset of output is utf8 [from fumbling644o] 2022-04-23 02:28:34 +08:00
yarik0chka
266443b321 Implemented sitting 2022-04-22 23:24:51 +05:00
xtaodada
04c0e968ed
Add PublicPort field to server 2022-04-23 01:42:04 +08:00
Yazawazi
f9b5c8a9ee
command fix 2022-04-23 01:36:48 +08:00
xtaodada
26c3651cc8
Add PublicPort field to Dispatch server 2022-04-23 01:16:55 +08:00
Yazawazi
34c0c6b01b
setfetterlevel command 2022-04-22 23:46:24 +08:00
PasserbyAlpha
1b39f67032 fixed encoding problem when generating gm handbook 2022-04-22 23:11:29 +08:00
Yazawazi
9edb70d6cf
AvatarFetterLevel 2022-04-22 22:27:40 +08:00
Jaida Wu
746e16a25a
Add FrontHTTPS field to Dispatch server 
Signed-off-by: Jaida Wu <mlgmxyysd@meowcat.org>
 2022-04-22 21:25:58 +08:00
Melledy
e86932606a Revert "Explicitly load and save UTF-8 for the handbook" 
This reverts commit fe6e9967db.
 2022-04-22 05:20:02 -07:00
Melledy
db0e39bd72
Merge pull request #113 from 01101sam/patch-1 
[typo] Fix resources folder tips
 2022-04-22 04:38:04 -07:00
Melledy
08e3d7e4fb
Merge pull request #114 from alt3ri/development 
Added /talent command
 2022-04-22 04:35:10 -07:00
Melledy
e4681ba5be
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
0baeb32b41 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
f8c31cfd96
Deleted 2 lines 2022-04-22 17:38:58 +07:00
alt3ri
1548c2a8d7
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
21f82519cf
[typo-upd] Add missing folder 2022-04-22 17:43:06 +08:00
Sam
9715c1d646
[typo] Fix resources folder tips 2022-04-22 17:36:24 +08:00
Benjamin Elsdon
1c6a5d4835 Initial work on mail 2022-04-22 15:52:31 +08:00
Benjamin Elsdon
af4086b4d9 Update protos 2022-04-22 15:24:23 +08:00
fumbling
fe6e9967db 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
c638359302 Log files 2022-04-22 13:05:06 +08:00
Magix
e76b60d7c7
Merge pull request #94 from Yazawazi/development 
Try to show characters' stories and voices
 2022-04-21 23:12:02 -04:00
Yazawazi
d37543beaf
cache fetters 2022-04-22 10:39:25 +08:00
fumbling
91b685586e 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
fd42dd558f change fhp to heal 2022-04-22 08:45:46 +08:00
Yazawazi
cb043e0644
no more NullPointerException pls 2022-04-22 08:30:02 +08:00
fengyuecanzhu
85fd060561 remove revive command 2022-04-22 08:26:48 +08:00
fengyuecanzhu
a47655db7a add fullfp command 2022-04-22 08:08:47 +08:00
Yazawazi
1c6aa32cea
ee, forget to change variables when copying from local 2022-04-22 07:49:35 +08:00
Yazawazi
a3f528ede0
typo 2022-04-22 07:42:17 +08:00
Yazawazi
6b8b6b4899
fetter try 2022-04-22 07:37:25 +08:00
Melledy
a05f8270ab
Merge pull request #74 from 4Benj/development 
Server run modes and multi-server dispatch support
 2022-04-21 15:06:57 -07:00
Melledy
eb44fc88c4 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
18707f9309 Merge branch 'development' into account-fix 2022-04-21 14:46:07 -07:00
Melledy
d19d80fa4e Save config everytime you load so the new options show up 2022-04-21 14:44:55 -07:00
Melledy
860e28e56a
Merge pull request #88 from alt3ri/development 
Added /revive command
 2022-04-21 14:05:09 -07:00
Melledy
dca137a93e Fix account dupe key error after selecting starting character 2022-04-21 14:02:17 -07:00
alt3ri
96a252f9dd
Added /revive command 
Now it's more convenient to revive character without food :>
 2022-04-22 02:28:52 +07:00
Melledy
a93398a18b
Merge pull request #86 from alt3ri/patch-7 
Fix typo
 2022-04-21 11:47:30 -07:00
Melledy
29fe983f67
Merge pull request #84 from yarik0chka/development 
Add a changing weather id
 2022-04-21 11:47:13 -07:00
Yazawazi
a01783ef3c
Teleport Small Fix 2022-04-22 02:23:02 +08:00
alt3ri
2cc8d48fde
Fix typo 
"When you create a new account via auto register or console server then during scene select a character and write a name on it press it it will get stuck and make the server disconnected. Some can get through and some can't passed it, so currently I'm still on the stable version . even how many times have I deleted the datebase and tried it on some linux and directly on windows too :/ btw 6863600865/src/main/java/emu/grasscutter/data/ResourceLoader.java (L131) in scene folder there is a typo name "BinOutPut" it should be "BinOutput" so scene file can't be found." - [Yuki#4985](https://discord.com/channels/965284035985305680/965284036333424722/966756877100789760)
Thanks [Yuki#4985](https://discord.com/channels/965284035985305680/965284036333424722/966756877100789760)
 2022-04-22 00:54:06 +07:00
yarik0chka
38c0c9eb7c Add a changing weather id 2022-04-21 22:21:24 +05:00
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
68deff0c95
Listens to all addresses by default 
Signed-off-by: Jaida Wu <mlgmxyysd@meowcat.org>
 2022-04-22 00:02:03 +08: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
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
Melledy
8d6019fe8f
Merge pull request #24 from Yazawazi/main 
Fix weapon refine
 2022-04-19 04:14:17 -07: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
Yazawazi
e177b111f0
Fix refine 2022-04-19 18:59:43 +08:00
Benjamin Elsdon
73cf9db747 Modified the new commands to be compliant with my changes 2022-04-19 18:55:49 +08:00
Yazawazi
56ca323645
getAwakenMaterial Add 2022-04-19 18:55:32 +08:00
Benjamin Elsdon
26c3336a0b Merge branch 'main' of https://github.com/Melledy/Grasscutter 2022-04-19 18:44:10 +08:00
Melledy
971c5470ba
Merge pull request #22 from SpikeHD/level_setting_commands 
Set world level command
 2022-04-19 03:22:45 -07:00
Benjamin Elsdon
ceaedca209 Admin cmds, perms and descriptions for all cmds + 
Additonal stuff: Fixed + refactored help command. Removed 'Usage: ' from all commands. Created 'player.hasPermission(permission)' function. Created default for Usage annotation. Created hashmap version of 'getHandlers' and renamed the original to getHandlersAsList()
 2022-04-19 18:17:19 +08:00
SpikeHD
98f1ab7393 set world level command 2022-04-19 02:44:33 -07:00
Melledy
c4ccb298f9 Refactor some commands and move inventory/team limits to the config 2022-04-19 02:22:21 -07:00
SpikeHD
61e03bdc8c properly add ascension-locked talents 2022-04-19 02:06:58 -07:00
Melledy
f7752c027d Fix issue with a player not being able to spawn when they join somone in co-op with a singleplayer team of more than the max allowed amount 2022-04-19 01:43:38 -07:00
SpikeHD
535a9167cf calculate ascension based on level provided to givechar command 2022-04-19 01:37:52 -07:00
Melledy
7b0054e936 Grant superuser permissions to accounts created before the permissions update 2022-04-19 01:28:31 -07:00
SpikeHD
5bf2e5d935 fix references to givechar 2022-04-19 01:01:40 -07:00
SpikeHD
5c6578a2f8 fix conventions to match other commands 2022-04-19 00:41:40 -07:00
SpikeHD
f7baa1dbeb Give character command base 2022-04-19 00:15:10 -07:00
Melledy
e8b6f23bcb Make co-op players spawn into the host's scene too 2022-04-18 23:09:48 -07:00
Melledy
02fc29ce90 Deregister empty scenes if a player leaves them 2022-04-18 23:00:12 -07:00
Melledy
53e7f01a15
Merge pull request #16 from pedox/feat-dispatch-server 
Added Config for using http server with non SSL
 2022-04-18 22:05:51 -07:00
Melledy
5c71c97108 Grant superuser permissions to accounts created before the permissions update 2022-04-18 22:00:01 -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
Melledy
bcf234e087
Merge pull request #15 from Melledy/file-separator 
Use the operating system's file separator
 2022-04-18 20:55:12 -07:00
KingRainbow44
27c9545b0d
GameServer#getPlayerByUid = GameServer#getPlayerById 2022-04-18 23:53:05 -04:00
KingRainbow44
87a9d0c590
Implement basic permission system 2022-04-18 23:46:04 -04:00
KingRainbow44
17163ff81c
Use OS file separator 2022-04-18 23:26:34 -04:00
KingRainbow44
fa65f512ca
Generic help command 2022-04-18 23:06:03 -04:00
KingRainbow44
ba4e727302
Fix bugs with commands 2022-04-18 22:31:31 -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
052d0dbf87
Add color to logback 2022-04-18 22:10:51 -04:00
KingRainbow44
a0e26352a6
Add existing commands 2022-04-18 22:10:41 -04:00
KingRainbow44
1028e48e49
Execution power 2022-04-18 22:09:51 -04:00
KingRainbow44
4f7f3580db
Fix registering error & implement handling 2022-04-18 20:11:23 -04:00
KingRainbow44
ce51e9d6c3
Implement new command system 2022-04-18 18:24:08 -04:00
Melledy
59c027eab9 Update failure message when not being able to change scene 2022-04-18 10:17:19 -07:00
Melledy
b2466693ae Fix small issue with command parsing 2022-04-18 10:15:33 -07:00
Melledy
afdadc41bc Set scene names to generate in the handbook 2022-04-18 10:14:45 -07:00
Melledy
121f4675d7 Add SceneDatas 2022-04-18 10:14:32 -07:00
Melledy
696647dbd1 Fix small issue with command parsing 2022-04-18 09:59:57 -07:00
Melledy
e00bd69278 Add !changescene command 2022-04-18 09:59:21 -07:00
Melledy
1322f909f3 Simple sanity check when changing scenes 2022-04-18 09:59:00 -07:00
Melledy
cf69b61b98 Merge branch 'main' into dev-scene 2022-04-18 09:40:06 -07:00
Melledy
06ad1e8f9b Implement support for multiple scenes in a world 2022-04-18 09:39:29 -07:00
Benjamin Elsdon
3be50b5b01 Refactored PlayerCommands, added commands and more 
Added player "Help" command, added server "sendmsg" command, changed getAcccountByPlayerID to public in DatabaseHelper, and allowed player commands to be submitted with "/" and "!"
 2022-04-18 23:47:26 +08:00
ayy lmao
f3dc5f81ea Add support for specifying a Public IP 2022-04-18 12:10:39 +03:00
Melledy
5398410113 Properly level up characters with the character exp virtual item 2022-04-18 00:45:28 -07:00
Melledy
58c03d9317 Random thing for logback 2022-04-18 00:42:58 -07: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
Melledy
51cba69915 Limit co-op teams to 4 avatars max total 2022-04-17 23:36: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