Grasscutters/Grasscutter
3
0
Fork 0
mirror of https://github.com/Melledy/Grasscutter.git synced 2024-11-25 04:19:40 +00:00
Code Issues Projects Releases Wiki Activity
2,101 Commits 7 Branches 22 Tags 133 MiB
7d13847144
Commit Graph

1651 Commits

Author SHA1 Message Date
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
xtaodada
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
xtaodada
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
xtaodada
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
xtaodada
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
alt3ri
abe05a9b5d Added /revive command 
Now it's more convenient to revive character without food :>
 2022-04-22 02:28:52 +07:00
Melledy
c8100394d9 Merge pull request #86 from alt3ri/patch-7 
Fix typo
 2022-04-21 11:47:30 -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
alt3ri
452e89b4db 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 0e7976f906/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
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
54856147ef Listens to all addresses by default 
Signed-off-by: Jaida Wu <mlgmxyysd@meowcat.org>
 2022-04-22 00:02:03 +08: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
Melledy
dccee2dfde 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
bf61d6fb10 Merge pull request #79 from zamlty/development 
Fix artifact & weapon generation by give command
 2022-04-21 09:00:30 -07: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
Jaida Wu
9867ce7369 Add list command 
Signed-off-by: Jaida Wu <mlgmxyysd@meowcat.org>
 2022-04-21 22:55:32 +08:00
Benjamin Elsdon
1969d38e06 DatabaseManager clean up 2022-04-21 22:50:06 +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
zamlty
bce3e256cf Fix artifact & weapon generation by give command 2022-04-21 22:21:39 +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
Melledy
9cebd7be9a Merge pull request #69 from Grasscutters/dev-fixes 
Dev fixes
 2022-04-21 00:09:12 -07:00
KingRainbow44
0a96012f2c why is Account#onLoad THE DAMN REASON FOR HOURS OF TESTING 2022-04-21 02:07:05 -04:00
Benjamin Elsdon
83fe5818dc Restructured the config file in preperation for server run modes 2022-04-21 13:53:50 +08:00
Melledy
74bce2fe18 Merge pull request #66 from labalityowo/development 
Remove stella constellation appeareance in gacha pull
 2022-04-20 22:09:56 -07:00
Melledy
24b1fd2045 Merge pull request #65 from fengyuecanzhu/development 
args check for setstats command
 2022-04-20 22:05:58 -07:00
Melledy
af1ecca963 More refactoring (player id -> player uid) 2022-04-20 21:50:33 -07:00
fengyuecanzhu
7fcaa97a6a add args check 2022-04-21 12:49:23 +08:00
labalityowo
2b0831b7de Remove the stella appearance 2022-04-21 11:42:21 +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
KingRainbow44
b902fa6f48 Fix command detection 2022-04-20 23:56:27 -04:00
fengyuecanzhu
f3ede17d4d change description 2022-04-21 11:52:53 +08:00
fengyuecanzhu
4ab12f418e add description and permission to setstats command 2022-04-21 11:43:31 +08:00
Yazawazi
f6df468e47 folder check 2022-04-21 10:37:24 +08: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
KingRainbow44
d7328dda50 Update Morphia to 2.x 2022-04-20 21:11:57 -04:00
KingRainbow44
415f22d956 Fix merge conflict 2022-04-20 18:55:01 -04:00
KingRainbow44
652a2154ce Magix sanity. 2022-04-20 18:48:24 -04:00
Melledy
a506117053 Merge pull request #60 from Yazawazi/development 
Adding a `Teleport to Waypoint` Function
 2022-04-20 14:31:14 -07:00
Yazawazi
ec438dc16e session send sorry 2022-04-21 04:59:42 +08:00
alt3ri
d33ab09e5f 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
6f43c0765f teleports 2022-04-21 04:45:38 +08:00
alt3ri
d0529641b3 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
19572f46e3 Merge pull request #55 from memetrollsXD/development 
Custom Y position on MarkMapReq
 2022-04-20 12:36:42 -07:00
Benjamin Elsdon
482c174ee7 Reload command now reloads gacha config (again) 2022-04-21 00:28:14 +08: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
Jaida Wu
4d8a16ece8 Add setstats command 
Signed-off-by: Jaida Wu <mlgmxyysd@meowcat.org>
 2022-04-20 21:15:37 +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
54faab8f0d Add restart command 
Signed-off-by: Jaida Wu <mlgmxyysd@meowcat.org>
 2022-04-20 21:06:59 +08:00
Jaida Wu
00a746be3c Correct pos usage 
Signed-off-by: Jaida Wu <mlgmxyysd@meowcat.org>
 2022-04-20 21:04:09 +08:00
Jaida Wu
e8a3059907 Add weather command 
Signed-off-by: Jaida Wu <mlgmxyysd@meowcat.org>
 2022-04-20 21:03:30 +08:00
Jaida Wu
c42fa4ee5d Add pos command 
Signed-off-by: Jaida Wu <mlgmxyysd@meowcat.org>
 2022-04-20 20:58:57 +08:00
Jaida Wu
b44df66c94 Save account to database 
Signed-off-by: Jaida Wu <mlgmxyysd@meowcat.org>
 2022-04-20 20:56:22 +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
105efe1d81 Merge pull request #44 from Yazawazi/main 
Add /weather Command
 2022-04-20 04:50:48 -07:00
alt3ri
c603093d47 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
7e6bcca2c3 Merge branch 'development' into main 2022-04-20 19:09:48 +08:00
Melledy
5a09c22aa1 Fix character abilities not showing for others in co-op/lasting too long 2022-04-20 03:42:59 -07:00
alt3ri
aeb335c843 Adding /pos 
Some people want to get the coordinate, here you go!
 2022-04-20 17:40:26 +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
Benjamin Elsdon
1c2560736f /reload now reloads the gacha as well 2022-04-20 17:17:59 +08:00
Melledy
88e608adba 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
500580f368 Add /weather Command 2022-04-20 17:16:21 +08:00
Benjamin Elsdon
26e1341ce9 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
28a070f19a Forgot config check 2022-04-20 16:07:18 +08:00
Benjamin Elsdon
d59799ce55 Update gradle + Work gacha reload (gs broken atm) 2022-04-20 16:05:53 +08:00
memetrollsXD
77076a766b Merge branch 'development' into restart-command 2022-04-20 09:03:18 +02:00
memetrollsXD
2632ae373c Fix merge conflict 2022-04-20 09:00:50 +02:00
memetrollsXD
ad1e9400e3 It won't get better than this for now.. 2022-04-20 08:52:47 +02:00
w4123
716b6df2ec Implement stub NpcTalk packets 2022-04-20 12:25:38 +08:00
KingRainbow44
7137f5b715 totally not me forgetting how this works 2022-04-20 00:15:37 -04:00
KingRainbow44
107f6b9a44 Change to String#equals 2022-04-20 00:10:43 -04:00
KingRainbow44
f58c590aa3 Add config option 2022-04-20 00:10:32 -04:00
KingRainbow44
dd826abb55 Automatically create account on login screen 2022-04-20 00:03:01 -04:00
KingRainbow44
866941589b Small updates to server commands 2022-04-19 14:11:48 -04:00
Magix
71cdd2c8e9 Merge branch 'main' into main 2022-04-19 14:07:39 -04:00
memetrollsXD
d603681355 Try PlayerTokenRsp instead of LoginRsp 2022-04-19 19:45:39 +02:00
memetrollsXD
657ac2e529 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
ac6ae1178d Fix folder seperators 2022-04-19 19:21:14 +03:00
Melledy
c72891ff97 Merge pull request #26 from Yazawazi/main 
unlockAvatarConstellation fix
 2022-04-19 09:18:42 -07:00
Melledy
5bc1448d82 Merge pull request #27 from OtakuNekoP/main 
skip beta server device id verify
 2022-04-19 09:09:17 -07:00
Melledy
76ed85ee68 Merge pull request #25 from xmplay/main 
add water to golden apple archipelago by default
 2022-04-19 09:08:58 -07:00
KingRainbow44
c728b9f5fe Attempt to fix !givechar 2022-04-19 10:31:24 -04:00
KingRainbow44
69cb03f4d4 Command reformat 2022-04-19 10:00:50 -04:00
OtakuNekoP
e1257739b7 skip beta server device id verify 2022-04-19 14:48:03 +02:00
Benjamin Elsdon
f54cfc6c75 Fixed an issue with kicking players 
(Still broken but now it actually disconnects the player)
 2022-04-19 20:36:15 +08:00
Yazawazi
5fcecfc734 talentData 
sorry again, forgot to add
 2022-04-19 20:05:45 +08:00
xmplay
4b279b45e0 Update PacketPlayerEnterSceneNotify.java 2022-04-19 13:03:43 +01:00
Yazawazi
1db13a6fa9 Constellation fix 2022-04-19 19:48:26 +08:00
Benjamin Elsdon
058d322238 Merge remote-tracking branch 'upstream/main' 2022-04-19 19:34:02 +08:00
Melledy
2572d55c00 Merge pull request #24 from Yazawazi/main 
Fix weapon refine
 2022-04-19 04:14:17 -07:00
Melledy
aedfb59831 Remove duplicate function and fix stackoverflow issue 2022-04-19 04:13:38 -07:00
Melledy
06a50365d1 Merge branch 'dev-scene' 2022-04-19 04:12:53 -07:00
Yazawazi
3da79a1dc1 Fix refine 2022-04-19 18:59:43 +08:00
Benjamin Elsdon
dfc956a19f Modified the new commands to be compliant with my changes 2022-04-19 18:55:49 +08:00
Yazawazi
f74ca6e9a0 getAwakenMaterial Add 2022-04-19 18:55:32 +08:00
Benjamin Elsdon
6e14dda855 Merge branch 'main' of https://github.com/Melledy/Grasscutter 2022-04-19 18:44:10 +08:00
Melledy
2d2013dfee Merge pull request #22 from SpikeHD/level_setting_commands 
Set world level command
 2022-04-19 03:22:45 -07:00
Benjamin Elsdon
5cea728eb7 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
d5ad82b598 set world level command 2022-04-19 02:44:33 -07:00
Melledy
d9fc159550 Refactor some commands and move inventory/team limits to the config 2022-04-19 02:22:21 -07:00
SpikeHD
ed448a9f84 properly add ascension-locked talents 2022-04-19 02:06:58 -07:00
Melledy
7417a1b62c 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
cc9beed961 calculate ascension based on level provided to givechar command 2022-04-19 01:37:52 -07:00
Melledy
3cc025efe0 Grant superuser permissions to accounts created before the permissions update 2022-04-19 01:28:31 -07:00
SpikeHD
a5caf3d56c fix references to givechar 2022-04-19 01:01:40 -07:00
SpikeHD
91e4a087bc fix conventions to match other commands 2022-04-19 00:41:40 -07:00
SpikeHD
21a1503288 Give character command base 2022-04-19 00:15:10 -07:00
Melledy
3ea9e15745 Make co-op players spawn into the host's scene too 2022-04-18 23:09:48 -07:00
Melledy
dd8d1752ed Deregister empty scenes if a player leaves them 2022-04-18 23:00:12 -07:00
Melledy
3e7dc503a7 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
efc9a4b3e5 Grant superuser permissions to accounts created before the permissions update 2022-04-18 22:00:01 -07:00
naufal
0ff6ea427a feat: added configuration for change upload port 
feat: added configuration for use non SSL
 2022-04-19 11:49:08 +07:00
Melledy
4cf734fb61 Fix permissions not saving 2022-04-18 21:38:38 -07:00
Melledy
c65443f422 Fix permissions not saving 2022-04-18 21:38:19 -07:00
Melledy
057f568a37 Merge branch 'main' into dev-scene 2022-04-18 21:35:01 -07:00
Melledy
4b05ed28cb Merge pull request #15 from Melledy/file-separator 
Use the operating system's file separator
 2022-04-18 20:55:12 -07:00
KingRainbow44
7666c92cf1 GameServer#getPlayerByUid = GameServer#getPlayerById 2022-04-18 23:53:05 -04:00
KingRainbow44
824b3a4bf4 Implement basic permission system 2022-04-18 23:46:04 -04:00
KingRainbow44
d873b8ad0f Use OS file separator 2022-04-18 23:26:34 -04:00
KingRainbow44
93a6914261 Generic help command 2022-04-18 23:06:03 -04:00
KingRainbow44
f11138dedc Fix bugs with commands 2022-04-18 22:31:31 -04:00
KingRainbow44
2e01c7d5ad Find by player's UID not IID 2022-04-18 22:23:22 -04:00
KingRainbow44
a4932c7557 Refactor method names & add / prefix 2022-04-18 22:16:20 -04:00
KingRainbow44
c162632fbd Add color to logback 2022-04-18 22:10:51 -04:00
KingRainbow44
b35ee455e5 Add existing commands 2022-04-18 22:10:41 -04:00
KingRainbow44
61c0ff36e7 Execution power 2022-04-18 22:09:51 -04:00
KingRainbow44
25c414be1c Fix registering error & implement handling 2022-04-18 20:11:23 -04:00
KingRainbow44
9cd65046b1 Implement new command system 2022-04-18 18:24:08 -04:00
Melledy
e8261d568b Update failure message when not being able to change scene 2022-04-18 10:17:19 -07:00
Melledy
e7a3e8252d Fix small issue with command parsing 2022-04-18 10:15:33 -07:00
Melledy
c1d5b1fc8f Set scene names to generate in the handbook 2022-04-18 10:14:45 -07:00
Melledy
d3eb0dcfc2 Add SceneDatas 2022-04-18 10:14:32 -07:00
Melledy
495ca5c16c Fix small issue with command parsing 2022-04-18 09:59:57 -07:00
Melledy
7bac86ed41 Add !changescene command 2022-04-18 09:59:21 -07:00
Melledy
be89a6099e Simple sanity check when changing scenes 2022-04-18 09:59:00 -07:00
Melledy
a5a420da9d Merge branch 'main' into dev-scene 2022-04-18 09:40:06 -07:00
Melledy
bee654c64f Implement support for multiple scenes in a world 2022-04-18 09:39:29 -07:00
Benjamin Elsdon
ea2b2f9502 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
f769ef1858 Add support for specifying a Public IP 2022-04-18 12:10:39 +03:00
Melledy
61e4491ed1 Properly level up characters with the character exp virtual item 2022-04-18 00:45:28 -07:00
Melledy
ab343aebd4 Random thing for logback 2022-04-18 00:42:58 -07:00
Melledy
be180179a1 Merge branch 'main' of https://github.com/Melledy/Grasscutter 2022-04-17 23:45:08 -07:00
Melledy
ad57bb91df Remove gadgets from world when a player leaves 2022-04-17 23:43:47 -07:00
Melledy
c919c9c9eb Limit co-op teams to 4 avatars max total 2022-04-17 23:36:47 -07:00
KingRainbow44
8b5f7dd06f Refactor existing code 2022-04-18 01:11:27 -04:00
Melledy
7925d1cda3 Initial commit 2022-04-17 05:43:07 -07:00