Grasscutters/Grasscutter
3
0
Fork 0
mirror of https://github.com/Melledy/Grasscutter.git synced 2024-12-03 20:18:23 +00:00
Code Issues Projects Releases Wiki Activity
1,188 Commits 7 Branches 22 Tags 136 MiB
243ad3abe5
Commit Graph

52 Commits

Author SHA1 Message Date
Melledy
243ad3abe5 Refactor accounts to not use a player uid 2022-05-27 00:22:55 -07:00
zhaodice
2a467a48dc Fix connection bugs without removing binding address (#993) 
* Fix connection bugs according to #921

Fix this for connect to game by local device or remote devices according to #921

* Fix connection bugs according to #921

same

* Update GameServer.java

* fix build

* Update GameServer.java
 2022-05-19 08:35:14 -07:00
line-bear
87966b9e98 Remove the extra slash while loading resources. (#893) 
* Remove the extra slash

* Update src/main/java/emu/grasscutter/Configuration.java

Co-authored-by: HotaruYS <105128850+HotaruYS@users.noreply.github.com>

* Update src/main/java/emu/grasscutter/Configuration.java

Co-authored-by: HotaruYS <105128850+HotaruYS@users.noreply.github.com>

* Update src/main/java/emu/grasscutter/Configuration.java

Co-authored-by: HotaruYS <105128850+HotaruYS@users.noreply.github.com>

* Import java.nio.file.Paths to use Paths.get

* Mark fields as private to prevent use *FOLDER directly

* Remove unnecessary slash

Co-authored-by: HotaruYS <105128850+HotaruYS@users.noreply.github.com>
 2022-05-15 23:32:03 -07:00
muhammadeko
05e13d81ad Modify chat manager to give plugin ability to change it 2022-05-14 23:27:36 -07:00
Melledy
f4770cf20a Merge pull request #816 from Grasscutters/dev-quests 
Implement quests
 2022-05-13 05:36:30 -07:00
Akka
3c55aa64eb fix: LEAK: ByteBuf.release() was not called 2022-05-13 00:21:26 -07:00
Melledy
1231802192 Implement basic quest condition handling 
Quests that require talking to npcs now work.
 2022-05-12 02:30:34 -07:00
KingRainbow44
11161227ab Convert to the far superior config system 2022-05-11 00:30:07 -04:00
Akka
9fc4b916c8 Persist Tower Data && Set The Tower Schedule 2022-05-08 06:06:32 -07:00
Magix
711ae2f554 Merge branch 'development' into development 2022-05-06 21:08:19 -04:00
KingRainbow44
c11e83c48f Bug fixes 2022-05-06 21:04:39 -04:00
Bwly999
79babcc53e roll back to timer 2022-05-07 08:00:31 +08:00
KingRainbow44
0d7f58fc25 Merge development into localization 2022-05-06 19:40:32 -04:00
Kinesis
8abd3ace6c Implement Avatar Expedition System 
Co-Authored-By: ShigemoriHakura <62388797+ShigemoriHakura@users.noreply.github.com>
Co-Authored-By: KanyeWestc <104547412+KanyeWestc@users.noreply.github.com>
Co-Authored-By: QAQ 天小络 <72185326+XTL676@users.noreply.github.com>
Co-Authored-By: nkxingxh <25559053+nkxingxh@users.noreply.github.com>
Co-Authored-By: Yazawazi <47273265+Yazawazi@users.noreply.github.com>
Co-Authored-By: wuwuwu223 <81224214+wuwuwu223@users.noreply.github.com>
Co-Authored-By: omg-xtao <100690902+omg-xtao@users.noreply.github.com>
Co-Authored-By: Sakura <104815797+Sakura@users.noreply.github.com>
Co-Authored-By: NewNeko-2022 <104819344+NewNeko-2022@users.noreply.github.com>
Co-Authored-By: JimWails <30657653+JimWails@users.noreply.github.com>
Co-Authored-By: buttercookies <19878609+ButterCookies@users.noreply.github.com>
 2022-05-06 13:28:26 -07:00
Bwly999
6149c6f0e3 Merge branch 'development' of github.com:Grasscutters/Grasscutter into development 2022-05-06 22:38:04 +08:00
4Benj_
3ede7523b0 Stop WindSeedClientNotify and PlayerLuaShellNotify from being sent (#582) 2022-05-06 15:48:16 +02:00
Bwly999
2d325e1847 fix the problem that the reference of serverHook in Plugin object is null 2022-05-06 18:16:07 +08:00
KingRainbow44
c0b1ec1b9e Convert to the superior language system. (pt. 2) 2022-05-06 00:57:45 -04:00
Akka
48d1e026ef Add Support of Item Combine (#513) 
* Add Support of Item Combine

* Add Support of Item Combine

Co-authored-by: Melledy <52122272+Melledy@users.noreply.github.com>
 2022-05-04 10:06:13 -07:00
方块君
b8f5299995 Optimize multilingualism (using variables) 
Optimize multilingualism (using variables)
 2022-05-03 22:17:41 -07:00
Melledy
c930c637e4 Add languages folder to config as well 2022-05-03 03:19:43 -07:00
方块君
0eab44f51f Add multilingual support 
Add multilingual support
 2022-05-03 02:38:37 -07:00
coooookies
a8b808ba2e Improve registration methods. 2022-05-01 10:02:57 -07:00
coooookies
dde5a609fb GameServerPacketHandler need to be added a registration interface for plugin developers 2022-05-01 10:02:57 -07:00
Melledy
10bfb6976d Change RunMode and DebugMode to enums 2022-04-30 22:52:09 -07:00
Benjamin Elsdon
947d3e5745 Complete rework of Dispatch, Added DebugMode 2022-05-01 00:30:56 +08:00
KingRainbow44
d701613831 Formatting changes 2022-04-28 22:21:30 -04:00
Melledy
9d75c25085 Fix missing player tick function 2022-04-27 19:37:25 -07:00
Melledy
10e5851a59 Add message about the server being free 2022-04-27 11:23:33 -07:00
Kengxxiao
8b614d8df8 implement simple drop system 2022-04-27 17:42:02 +08:00
Melledy
d1fc8c1faa Moved some files around 2022-04-26 21:27:35 -07:00
Melledy
1c36f0785b Renamed all references to a certain game 2022-04-26 21:27:35 -07:00
Yazawazi
748e64a60c Moon Card 2022-04-27 06:04:21 +08:00
WetABQ
addfb5eb5d [BREAKING CHANGE] proto auto compiled by gradle (#226) 
* [BREAK] proto auto compiled by gradle

* [BREAK] move proto to submodule

* update gitmodules

* [BREAK] move proto to submodule

* move proto to submodule

* fix merge conflict

* fix github action after merging

* fix merge conflicts and del submodule

* upload the proto
 2022-04-26 14:44:30 -07:00
Magix
627a2f1ee8 Merge branch 'api' into development 2022-04-26 11:17:02 -04:00
KingRainbow44
e27bdd9bb6 Add more events 2022-04-26 02:07:00 -04:00
Melledy
2228332f9d Call checkSpawns from World instead of from Player 2022-04-25 14:28:45 -07:00
KingRainbow44
832c460a83 Implement packet send/receive events 2022-04-23 02:08:31 -04:00
Benjamin Elsdon
83fe5818dc Restructured the config file in preperation for server run modes 2022-04-21 13:53:50 +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
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
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
d59799ce55 Update gradle + Work gacha reload (gs broken atm) 2022-04-20 16:05:53 +08:00
Melledy
aedfb59831 Remove duplicate function and fix stackoverflow issue 2022-04-19 04:13:38 -07:00
Melledy
d9fc159550 Refactor some commands and move inventory/team limits to the config 2022-04-19 02:22:21 -07:00
Melledy
c65443f422 Fix permissions not saving 2022-04-18 21:38:19 -07:00