Akkariin/Grasscutter
1
0
Fork 0
mirror of https://github.com/Grasscutters/Grasscutter.git synced 2025-01-12 09:32:59 +08:00
Code Issues Projects Releases Wiki Activity
943 Commits 7 Branches 22 Tags 150 MiB
935bb4b523
Commit Graph

654 Commits

Author SHA1 Message Date
Melledy
19396a63c7 Move player mail to MailHandler class 
This is so we dont have to save the entire player to the db every time we send mail
 2022-05-02 02:01:01 -07:00
KingRainbow44
afa8fb7a51 Merge remote-tracking branch 'origin/development' into development 2022-05-01 20:15:27 -04:00
mingjun97
98122f3c55 Implement gacha history record subsystem 
* Frontend is not very beautiful yet
* Didn't include too much `some anime game` data in the page to avoid being DMCA'd
 2022-05-01 13:47:17 -07:00
xtaodada
eb703f9f72 Fix goods limit bug 2022-05-01 13:42:01 -07:00
xtaodada
bd560785ba Show shopmall 2022-05-01 13:42:01 -07:00
筱傑
3cc1139aa1 Add /setstats mhp to set Max HP (#407) 
* Fixed `/setstats hp` without changing the max hp.

The Max HP should be modified.

* Add `/setstats mhp` to set Max HP
 2022-05-01 20:22:29 +02:00
JimWails
4adc983832 Fixed can set avatar level more than 90 and cause game to freeze 
Limit the avatar level given by "/givechar" command.
If avatar level >90, the game will freeze if open the character interface.
 2022-05-01 10:05:28 -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
Kinesis
677aa2d2c4 fix McoinExchangeHcoinRsp packet structure 2022-05-01 10:02:47 -07:00
筱傑
b9e27828b8 Fixed can set talent level to 16 bug (#408) 
Level should be **lower than 16**
 2022-05-01 16:42:02 +02:00
4Benj_
0d262e2d07 Cleaned up dispatch iOS fixes (#396) 
* Attempting to fix crashing on iOS devices

plus I forgot a thing in string.format

* Removed unnecessary things
 2022-04-30 23:31:39 -07:00
KingRainbow44
72b5ec210c Merge remote-tracking branch 'origin/development' into development 2022-05-01 02:14:35 -04:00
mingjun97
049086b21a Should fix all crashes when login for iOS client 2022-04-30 23:03:47 -07:00
mingjun97
d3ac090daa Fix crash and revise route 
* Fix another point which will trigger iOS client to crash
* Revise `compareProtocolVersion` route to handle all method
 2022-04-30 23:03:47 -07:00
Melledy
10bfb6976d Change RunMode and DebugMode to enums 2022-04-30 22:52:09 -07:00
Melledy
eac82f3c01 Fix possible exploit with mcoin exchange 2022-04-30 22:51:21 -07:00
Kinesis
da3eb3d26c implement McoinExchange packet Handler 2022-04-30 22:03:44 -07:00
mingjun97
fb547c17ca Revert changes for debugging purpose 2022-04-30 21:43:46 -07:00
mingjun97
8b8777e932 Fix crash when login 
* Prevent email to be `null` to avoid crash in certain client setup.
 2022-04-30 21:43:46 -07:00
Melledy
3169e87c60 Fix constellations that give an extra charge to skills 
Fix #228
 2022-04-30 19:34:50 -07:00
KingRainbow44
e898384532 QoL changes 2022-04-30 21:52:30 -04:00
KingRainbow44
a044448af7 Implement a handler for logging routes 2022-04-30 20:38:18 -04:00
muhammadeko
80659f27a8 Add getter for innerclass RegionData 2022-04-30 16:41:19 -07:00
Muhammad Eko Prasetyo
55793867d3 Fix DispatchHttpJson handler and add setHttpServer because Express doesn't support removing defined route. (#388) 2022-05-01 00:43:50 +02:00
Magix
be507310a5 Merge branch 'development' into api 2022-04-30 16:22:00 -04:00
Magix
a62520f922 Merge pull request #381 from Coooookies/development 
Show the player's UID with the `/list` command
 2022-04-30 16:16:18 -04:00
Magix
8ce79ed3ca Forgot to add to null execution 2022-04-30 16:15:39 -04:00
Magix
f4de4a6aeb Change to () and add space 2022-04-30 16:14:40 -04:00
KingRainbow44
86b8f4549f Merge remote-tracking branch 'origin/api' into api 2022-04-30 16:11:12 -04:00
KingRainbow44
b5c277234c Move join & quit to player event 2022-04-30 16:11:00 -04:00
Magix
63d41fd79e Merge branch 'development' into api 2022-04-30 16:07:54 -04:00
KingRainbow44
f73a713fac Create player creation event & move join event to player 2022-04-30 16:07:12 -04:00
coooookies
ba97dfe7d9 Uids will not be showed until the parameter <uid> is added, 
like this: /list uid
 2022-05-01 03:43:41 +08:00
LDA
d133e55666 Implement viewing character details in character showcase 2022-04-30 10:49:45 -07:00
Benjamin Elsdon
28025a8198 Small fix 2022-05-01 00:51:09 +08:00
Benjamin Elsdon
947d3e5745 Complete rework of Dispatch, Added DebugMode 2022-05-01 00:30:56 +08:00
coooookies
c0b7859f93 List command should show player uid 2022-05-01 00:17:08 +08:00
赤座あかり
eac9c04e4e Give Artifact: Fix error & Rename alias (#370) 
* Give Artifact: Fix error & Rename alias

* Update README.md
 2022-04-30 13:19:22 +02:00
Aru
d6fa05915f Monsters should drop items in world (#373) 
* Monsters should drop items in world

fix the typo introduced in f1934c3a47

* Determine whether in dungeon scene
 2022-04-30 13:18:09 +02:00
筱傑
7b991d7b4e Update Welcome Mail Items Type (#369) 2022-04-30 11:46:23 +02:00
Scirese
fb991d845e Add Android Client fix by @BaiSugar (#105) 2022-04-30 11:45:24 +02:00
omg-xtao
23800745e2 Merge branch 'development' into tp 2022-04-30 16:48:24 +08:00
lhhxxxxx
eef216aea8 Update Account.hasPermission() 
Add wildcard characters to permission nodes under the same namespace. (simple implementation)
 2022-04-30 01:30:38 -07:00
Melledy
286ab545e9 Monsters should not drop items inside dungeons 2022-04-30 01:20:44 -07:00
Melledy
7e377dff59 Implement script region check 2022-04-30 01:20:44 -07:00
Melledy
1ed46df6e8 Move script constants to globals 2022-04-30 01:20:44 -07:00
Melledy
3f76ac4cac Temporary fix for scripts that call require 2022-04-30 01:20:44 -07:00
Melledy
f8f4d89cd0 Optimize GetOnlinePlayerListRsp 2022-04-30 01:20:44 -07:00
Melledy
66c2743d6e Update how scene/dungeon map points are handled 2022-04-30 01:20:44 -07:00
lhhxxxxx
c2b8a20e03 Update GiveAllCommand.java 
giveall command nomore give arts
 2022-04-30 01:04:10 -07:00
筱傑
d8e458cd33 Fix Give Command Promote Level Bug 
Should be <=40, just change the order
 2022-04-30 01:02:39 -07:00
muhammadeko
8a9dab7d74 Give Artifact: Clear random props first before adding all picked props 2022-04-29 17:11:12 -07:00
KingRainbow44
4db1724d06 Merge branch 'development' into api 
# Conflicts:
#	src/main/java/emu/grasscutter/Grasscutter.java
 2022-04-29 19:31:33 -04:00
lilmayofuksu
59ff79e23a Limit the amount of vehicles that a player can spawn (#340) 2022-04-29 21:01:07 +02:00
BaiSugar
7e6b20de1a Added interface display for multiplayer games (#360) 2022-04-29 18:20:46 +02:00
赤座あかり
79165aa402 Add command to get reliquary with specific props (#300) 2022-04-29 16:31:22 +02:00
omg-xtao
7fdf74986c Merge branch 'development' into tp 2022-04-29 21:38:45 +08:00
真心
48aea3f5e4 Add 'refinement' option to 'give' command 2022-04-29 15:20:28 +02:00
真心
d0ccc48642 Add 'refinement' option to 'give' command 2022-04-29 15:20:28 +02:00
真心
9892cd8480 Delete GiveWeaponCommand.java 2022-04-29 15:20:28 +02:00
真心
2d04758f1c Add GiveWeaponCommand 2022-04-29 15:20:28 +02:00
xtaodada
eaed1aa038 Change NickName to ServerNickname 2022-04-29 19:37:51 +08:00
yangjiahao
e1c0b4a955 改进了clear命令的逻辑，使他在不输入uid时默认为当前玩家。 2022-04-29 13:07:30 +02:00
memetrollsXD
352801b8a3 Merge pull request #344 from BaiSugar/development 
Command giveall to remove useless items
 2022-04-29 13:04:25 +02:00
LDA
c67e324a2e Fix sitting in chairs 2022-04-29 12:59:50 +02:00
xtaodada
62f0be4966 Support custom server in-game nickname 2022-04-29 18:59:24 +08:00
memetrollsXD
2f39aff4a6 Merge pull request #355 from Grasscutters/dungeon-scripts 
Implemented Dungeon Support
 2022-04-29 12:58:01 +02:00
Melledy
6d98743025 Prevent console error spam when attacking gadgets 2022-04-29 03:33:14 -07:00
Melledy
d877d7eebc Remove player from challenge if they are leaving the scene 2022-04-29 03:24:36 -07:00
Melledy
cb15a5dec9 Deregister scenes if no one is in them instead of deregistering when no entities are in them 2022-04-29 03:09:17 -07:00
Melledy
ffc1f801e6 Implement spawning monsters by suite 2022-04-29 03:06:33 -07:00
xtaodada
0136425628 Support custom server avatar 2022-04-29 18:04:20 +08:00
xtaodada
74ad63573a Support Teleport from console 2022-04-29 17:53:42 +08:00
Melledy
ae3d9a4dc1 Add a few more functions for the script engine to call 2022-04-29 02:38:25 -07:00
muhammadeko
789e5f57b8 skip loading module-info.class 2022-04-29 02:32:35 -07:00
Melledy
1a5d4cf466 Implement lazy loading of scripts when they enter a new block 2022-04-29 02:07:25 -07:00
Melledy
3af5d20473 Prevent weird crashing if there was an error loading scripts 2022-04-29 01:15:40 -07:00
Melledy
14b6d3ce55 Fix monster levels in dungeons 2022-04-29 01:03:16 -07:00
Melledy
d690590ecf Implement AddExtraGroupSuite 2022-04-29 00:52:40 -07:00
Melledy
72e9a21ce3 Allow the player to finish dungeons 2022-04-29 00:49:05 -07:00
Melledy
8ab2b446cd Clean script events 2022-04-29 00:00:23 -07:00
BaiSugar
1bd8d871bb remove useless items 2022-04-29 14:18:32 +08:00
BaiSugar
76098cdb71 remove useless items 2022-04-29 14:13:09 +08:00
Melledy
30886da0ad Fix compile error caused by merge 2022-04-28 23:09:07 -07:00
Melledy
60cfa40d7f Merge branch 'development' into dungeon-scripts 2022-04-28 22:21:26 -07:00
Melledy
d71b7abfc3 Implement script support needed for dungeons 
Only a few are supported right now
You will need certain script files in ./resources/Scripts
 2022-04-28 22:19:14 -07:00
KingRainbow44
d359e5111a Player events + mail receive event 2022-04-28 22:21:55 -04:00
KingRainbow44
d701613831 Formatting changes 2022-04-28 22:21:30 -04:00
KingRainbow44
e666dede7e Move events (imports) 2022-04-28 22:13:19 -04:00
KingRainbow44
68cc386baa Move events 2022-04-28 22:12:57 -04:00
KingRainbow44
9d9c6566ed Player join & quit event 2022-04-28 22:12:41 -04:00
KingRainbow44
dc26f9e232 Add plugin data folders 2022-04-28 22:01:40 -04:00
KingRainbow44
91a2a55ed9 Bug fixes & class updates 2022-04-28 21:54:51 -04:00
KingRainbow44
694b5c1548 Merge branch 'development' into api 2022-04-28 21:53:58 -04:00
memetrollsXD
31764fe5d9 Merge branch 'development' into startMail 2022-04-28 22:45:23 +02:00
memetrollsXD
5c02fee7e2 Customisable welcome mail 2022-04-28 22:42:59 +02:00
Kengxxiao
fcb4894387 fix shop config issue 2022-04-28 13:30:50 -07:00
Kengxxiao
275fcc7dd6 shop improvement 2022-04-28 13:30:50 -07:00
Kengxxiao
0559cc4e0b official shop support 2022-04-28 13:30:50 -07:00
Kengxxiao
027bd28afb Add command /coop and /tpall 2022-04-28 21:23:20 +02:00
ayy lmao
0c02ce9f63 Implement HandlerVehicleInteractReq & Rsp and HandlerVehicleSpawnReq & Rsp 
Also added opcodes related to vehicles, added LODPatternName to GadgetData and added EntityVehicle class
 2022-04-28 21:21:08 +02:00
omg-xtao
31b0dd30e2 Ignore item not found error 2022-04-28 08:43:17 -07:00
Melledy
53cc1822f6 Implement dungeon entry 2022-04-28 08:20:37 -07:00
Kengxxiao
9133742eb0 fix companionship exp 
my IDEA lint is not happy on my change
 2022-04-28 06:50:37 -07:00
Kengxxiao
7bacd8ab70 do not save virtual item 2022-04-28 06:50:37 -07:00
Kengxxiao
ed98ab152d fix exp drop issue 2022-04-28 06:50:37 -07:00
BaiSugar
a5601e8409 Update the command format of the usage (including source code) 2022-04-28 13:47:32 +02:00
Melledy
9d75c25085 Fix missing player tick function 2022-04-27 19:37:25 -07:00
Melledy
d3925e8c6e Merge pull request #318 from Yazawazi/development 
Implementing the `Player Show Avatars`
 2022-04-27 15:50:53 -07:00
memetrollsXD
96dbc2fbfd God damn forgot I was in java for a sec 2022-04-27 15:42:25 -07:00
memetrollsXD
b80b8aedd9 Remove default permissions from account command 2022-04-27 15:42:25 -07:00
memetrollsXD
eaf2982ebc Apply to account command 2022-04-27 15:42:25 -07:00
memetrollsXD
0c665d940e Add default permissions 2022-04-27 15:42:25 -07:00
Yazawazi
0cbfcddae4 Should be OK 2022-04-28 06:40:25 +08:00
memetrollsXD
28a0844860 God damn forgot I was in java for a sec 2022-04-28 00:30:04 +02:00
memetrollsXD
8d332614b7 Remove default permissions from account command 2022-04-28 00:28:16 +02:00
memetrollsXD
90df06edd7 Apply to account command 2022-04-28 00:18:59 +02:00
memetrollsXD
5e9f497614 Add default permissions 2022-04-28 00:10:46 +02:00
Yazawazi
02ce62422f kill me plz 2022-04-28 03:46:24 +08:00
Yazawazi
982cbbe5d2 no headimage okay 2022-04-28 03:45:17 +08:00
Yazawazi
e55160dad6 Headimage 2022-04-28 03:40:32 +08:00
Yazawazi
363dae9fa6 Next time I'll never use github.dev again 2022-04-28 03:37:09 +08:00
Yazawazi
9092c9b3f9 import 2022-04-28 03:31:36 +08:00
Yazawazi
f16d33b413 Player show avatar list 2022-04-28 03:21:51 +08:00
Melledy
f6db39926d Fix co-op requests not showing up 2022-04-27 11:23:33 -07:00
Melledy
10e5851a59 Add message about the server being free 2022-04-27 11:23:33 -07:00
Melledy
555937d2aa Fixed concurrency issue in killall 2022-04-27 11:23:33 -07:00
Melledy
8bf17a8bdc Fixed genesis crystals not being given to player 2022-04-27 11:23:33 -07:00
Melledy
1586bab5d7 Gacha banner tweaks 
Removed min/maxItemType
Added configurable base weight values for banners
 2022-04-27 11:23:33 -07:00
Melledy
1130138a4f Fix internal server error when changing characters 2022-04-27 11:23:33 -07:00
KingRainbow44
d32f706cf3 Merge branch 'development' into api 
# Conflicts:
#	src/main/java/emu/grasscutter/plugin/api/ServerHook.java
 2022-04-27 14:05:34 -04:00
Yazawazi
2ba16cf8b2 comment & mooncard 2022-04-27 08:42:48 -07:00
Yazawazi
32d322b0be onEnable & onDisable 2022-04-27 08:42:48 -07:00
Yazawazi
5b6ecc7219 Task Improvement 2022-04-27 08:42:48 -07:00
Kengxxiao
669e58d9f3 Merge branch 'development' into dev-feature-drop 2022-04-27 22:54:59 +08:00
Kengxxiao
ee3a0c32fc use better shop config structure 2022-04-27 07:35:31 -07:00
Kengxxiao
3e0ccbbbde implement npc shop 2022-04-27 07:35:31 -07:00
ayy lmao
0e3a80407e Added missing isGiftMail section to GetAllMailRsp 2022-04-27 15:11:57 +02:00
Kengxxiao
57e408012b reset drop table in reload command 2022-04-27 17:44:12 +08:00
Kengxxiao
8b614d8df8 implement simple drop system 2022-04-27 17:42:02 +08:00
Magix
d19bc12761 Update Grasscutter.java 
why do i have to fix stable
 2022-04-27 11:33:36 +02: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
Melledy
6b8902bee2 Deprecate getServer() in DispatchServer, use getHttpServer() instead 2022-04-26 21:27:35 -07:00
Melledy
9afa32928a Cleanup https server creation in dispatch server 2022-04-26 21:27:35 -07:00
Melledy
cdb08195ee Fix cherry pick issues from drown packets 2022-04-26 21:27:35 -07:00
TheLostTree
a0ed13182c git doesnt like me 2022-04-26 21:27:35 -07:00
TheLostTree
687bc7ce87 drowning added 2022-04-26 21:27:35 -07:00
Melledy
d81895543f Call PacketItemAddHintNotify from addItem 2022-04-26 21:27:35 -07:00
Melledy
4420918f9c Rename handler 2022-04-26 21:27:35 -07:00
Melledy
7cf0e448cd World level updates without needing to restart 2022-04-26 21:27:35 -07:00
Melledy
9b7293272b Fix white screen after logging in 2022-04-26 21:27:35 -07:00
KingRainbow44
47d8fd3c43 Add get methods to the server hook 2022-04-26 21:24:37 -04:00
KingRainbow44
d4f9820e44 Added getting resources from the JAR 2022-04-26 21:24:09 -04:00
Benjamin Elsdon
cebc140228 GenshinPlayer fix (for two issues) and updated sendmail with Magix's suggestions 2022-04-27 09:03:26 +08:00
KingRainbow44
f3061a366e gave up, Pass class as argument to constructor 2022-04-26 20:54:56 -04:00
KingRainbow44
ae6a6abcd1 woo back to generics 2022-04-26 20:47:45 -04:00
KingRainbow44
749293350d Add dispatch to server hook & create instance 2022-04-26 20:47:28 -04:00
Benjamin Elsdon
0917f516ea Merge remote-tracking branch 'upstream/development' into dev-mail 2022-04-27 08:41:10 +08:00
Benjamin Elsdon
ed3f88f013 Removed debug messages, readded protos, fixed gradle 2022-04-27 08:36:13 +08:00
KingRainbow44
88bdaf155f Use a custom consumer instead of the built-in one 2022-04-26 20:28:13 -04:00
KingRainbow44
993255235e Fix handler invocation 2022-04-26 19:58:03 -04:00
KingRainbow44
0e514b9002 Fix handler creation 2022-04-26 19:57:32 -04:00
Melledy
2935f0a6d3 Merge pull request #270 from Yazawazi/development 
Add `bless of moon` feature
 2022-04-26 16:39:57 -07:00
Benjamin Elsdon
b9f7c657ac Merge remote-tracking branch 'upstream/development' into dev-mail 2022-04-27 07:37:05 +08:00
Yazawazi
aa4b88d762 cron expression comments 2022-04-27 07:19:30 +08:00
Yazawazi
e8b34b6179 comments del 2022-04-27 07:14:02 +08:00
Yazawazi
ac796675f2 comments 2022-04-27 07:08:33 +08:00
Yazawazi
420f544d68 DateHelper 2022-04-27 07:01:05 +08:00
Magix
71524b0b66 Merge pull request #178 from BaiSugar/development 
Added command to get all items
 2022-04-26 18:45:08 -04:00
Yazawazi
aab6627203 del outerclass 2022-04-27 06:25:00 +08:00
Yazawazi
49854e4514 utils 2022-04-27 06:15:59 +08:00
Yazawazi
43470a384d date helper 2022-04-27 06:12:35 +08: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
KingRainbow44
46d897ac92 Fix handlers 2022-04-26 14:09:00 -04:00
KingRainbow44
35ff35039b Fix Javadoc & Update version 2022-04-26 14:08:48 -04:00
KingRainbow44
82bca7a612 Overhaul event handling (designed by WetABQ#3417) 2022-04-26 13:52:10 -04:00
Magix
627a2f1ee8 Merge branch 'api' into development 2022-04-26 11:17:02 -04:00
Magix
fe055af5e0 Merge pull request #262 from exzork/plugin-system 
load all classes from plugin
 2022-04-26 10:27:36 -04:00
muhammadeko
9fb5b69ddd load all classes from plugin 2022-04-26 19:45:23 +07:00
BaiSugar
3c5f3d4157 remove test avatar 2022-04-26 16:35:06 +08:00
Benjamin Elsdon
3db1a86609 Merge remote-tracking branch 'upstream/development' into dev-mail 2022-04-26 15:45:58 +08:00
KingRainbow44
e27bdd9bb6 Add more events 2022-04-26 02:07:00 -04:00
KingRainbow44
502fe7ed13 Reimplement the region list event 2022-04-26 00:45:42 -04:00
KingRainbow44
e681453a15 Begin on plugin API 2022-04-26 00:39:43 -04:00
KingRainbow44
d23050ffa5 Bug fix & Cleanup 2022-04-26 00:39:30 -04:00
KingRainbow44
2369f92cb4 Fix command issue 2022-04-26 00:39:05 -04:00
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