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
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
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
0136425628
Support custom server avatar
2022-04-29 18:04:20 +08:00
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
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
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)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
