Commit Graph

820 Commits

Author SHA1 Message Date
github-actions
9bd833c6e7 Format code [skip actions] 2023-06-01 02:30:23 +00:00
KingRainbow44
8840e2b574 Merge remote-tracking branch 'origin/unstable' into unstable 2023-05-31 22:29:09 -04:00
KingRainbow44
3e2607af4c Add default open state ignore list 2023-05-31 22:28:25 -04:00
KingRainbow44
44a557a1dc Load activity config on server startup 2023-05-31 22:11:58 -04:00
KingRainbow44
4113b42707 Fix issue with 35303 being un-completable & Try to fix fulfilled quest conditions being met 2023-05-31 22:11:45 -04:00
github-actions
b1b8abc627 Format code [skip actions] 2023-06-01 01:06:12 +00:00
KingRainbow44
73c23707b4 Fix new avatar weapons being null 2023-05-31 21:04:38 -04:00
github-actions
bcf54dd6ba Format code [skip actions] 2023-05-31 23:57:51 +00:00
KingRainbow44
77a70c7880 Merge remote-tracking branch 'origin/unstable' into unstable
# Conflicts:
#	src/main/java/emu/grasscutter/game/entity/EntityWeapon.java
2023-05-31 19:56:14 -04:00
KingRainbow44
28da66fff4 Remove deprecated API & Fix resource checking 2023-05-31 19:38:12 -04:00
KingRainbow44
7db45a0a12 Fix EntityWeapon 2023-05-31 19:29:26 -04:00
github-actions
36dee424ee Format code [skip actions] 2023-05-31 23:26:53 +00:00
StartForKiller
815ba3e3e3 Fix something and implement weapon entities 2023-05-31 19:25:26 -04:00
KingRainbow44
25b75b9691 more trace 2023-05-31 19:17:41 -04:00
KingRainbow44
1269a0430e Move more logs to trace 2023-05-31 18:18:06 -04:00
github-actions
c69a889e66 Format code [skip actions] 2023-05-30 19:40:39 +00:00
KingRainbow44
36a35c11aa Use thread executors to speed up the database loading process 2023-05-30 15:38:26 -04:00
KingRainbow44
c6869aaaa2 HACK: Return the avatar which holds the weapon when the weapon is referred to by ID 2023-05-30 13:56:06 -04:00
KingRainbow44
a2eba7b795 Implement completely useless global value copying 2023-05-30 13:55:30 -04:00
KingRainbow44
01dfebf681 Format some code 2023-05-30 13:07:49 -04:00
github-actions
a3c56dff7e Format code [skip actions] 2023-05-30 06:43:54 +00:00
Magix
f00c54cb95 Implement a proper ability system (#2166)
* Apply fix `21dec2fe`

* Apply fix `89d01d5f`

* Apply fix `d900f154`

this one was already implemented; updated to use call from previous commit

* Ability changing commit

TODO: change info to debug

* Remove use of deprecated methods/fields

* Temp commit v2
(Adding LoseHP and some fixes)

* Oopsie

* Probably fix monster battle

* Fix issue with reflecting into fields

* Fix some things

* Fix ability names for 3.6 resources

* Improve logging

---------

Co-authored-by: StartForKiller <jesussanz2003@gmail.com>
2023-05-30 02:40:02 -04:00
Nazrin
9b58105120 Fully fix fairy clock for real this time (#2167)
* Fully fix fairy clock For real this time

* Make it so relogging keeps the time lock state.

* Refactor out questLockTime

* Per Hartie, the client packet needs to be changed too

* Update src/main/java/emu/grasscutter/game/world/World.java

Co-authored-by: Magix <27646710+KingRainbow44@users.noreply.github.com>

* Update src/main/java/emu/grasscutter/server/packet/recv/HandlerClientLockGameTimeNotify.java

* Remove all code not needed to get clock working

---------

Co-authored-by: Magix <27646710+KingRainbow44@users.noreply.github.com>
2023-05-30 02:39:34 -04:00
KingRainbow44
d35777d969 Implement fetching a player across servers & Add a chainable JsonObject
useful for plugins! might be used in grasscutter eventually
2023-05-26 14:52:22 -04:00
Nazrin
883dcef054 instantiate personalLineList (#2165) 2023-05-25 10:19:21 -04:00
Nazrin
a48bc24aae Remove manual autofinish for main quests. (#2162) 2023-05-22 03:58:47 -04:00
KingRainbow44
4c0ce8e20e Merge remote-tracking branch 'origin/unstable' into unstable 2023-05-22 03:15:18 -04:00
KingRainbow44
d8ad10e22d Add PlayerEnterAreaEvent 2023-05-22 02:57:59 -04:00
github-actions
e05a29ecf1 Format code [skip actions] 2023-05-21 02:02:00 +00:00
KingRainbow44
43ab558735 Add EntityCreationEvent 2023-05-20 21:08:35 -04:00
github-actions
6d845e1cc6 Format code [skip actions] 2023-05-20 15:45:17 +00:00
Nazrin
4e8726d29e Partially fix Chasing Shadows (#2159)
* Partially fix Chasing Shadows

* Go ahead and move it before the return before Magix tells me to.
2023-05-20 11:42:26 -04:00
github-actions
9b83ea9072 Format code [skip actions] 2023-05-20 08:05:42 +00:00
Nazrin
9eddd87095 fix NPC talk triggering main quest in 46101 (#2158)
Make it so that only talks where the param matches the talkId are checked.
2023-05-20 04:03:00 -04:00
github-actions
bbd201c90e Format code [skip actions] 2023-05-20 07:47:53 +00:00
KingRainbow44
d5de603d76 Fix changing target UID when talking to the server 2023-05-20 03:03:13 -04:00
KingRainbow44
cad6e90c90 Revert Multi-threaded resource loading 2023-05-20 02:55:33 -04:00
KingRainbow44
1a6fa43367 Clean up .utils 2023-05-20 02:25:49 -04:00
KingRainbow44
858c512f22 Add PlayerChatEvent 2023-05-19 19:49:29 -04:00
KingRainbow44
d89517f58e Add PlayerEnterDungeonEvent 2023-05-19 19:37:53 -04:00
KingRainbow44
8b9ca5ec7e Add PlayerOpenChestEvent 2023-05-19 19:32:07 -04:00
github-actions
33ba227982 Format code [skip actions] 2023-05-18 07:59:07 +00:00
KingRainbow44
b6b9d3d744 Multi-threaded resource loading 2023-05-18 03:56:38 -04:00
KingRainbow44
48959d54c5 More player property documentation 2023-05-18 03:15:52 -04:00
KingRainbow44
0047bb2e8d Merge remote-tracking branch 'origin/unstable' into unstable 2023-05-18 03:00:52 -04:00
github-actions
87ffbdd0f1 Format code [skip actions] 2023-05-18 06:59:08 +00:00
KingRainbow44
0c45a548cc Pause in-game time when the world is paused 2023-05-18 02:58:08 -04:00
KingRainbow44
c80e0f0572 Clean up logger more 2023-05-18 02:56:40 -04:00
KingRainbow44
13f055035f Use removeItemById for deleting items via quests 2023-05-18 02:56:12 -04:00
KingRainbow44
427cb039cf Move more logs to trace 2023-05-18 02:55:02 -04:00