Merge branch 'development' into plugin-priority (3585fd59) · Commits · ziqian zhang / Grasscutter · GitLab

Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

G

Grasscutter
- Activity
- Members
- Labels
- Issues
  0
- Issue boards
- Milestones
- Wiki
- Releases
- Package Registry
- Environments
- Terraform modules
- Incidents
- Service Desk

Snippets Groups Projects

ziqian zhang
Grasscutter
Commits
3585fd59

Commit 3585fd59 authored 3 years ago by

Magix Committed by GitHub 3 years ago

Downloads
- Plain Diff

Merge branch 'development' into plugin-priority

parents 1b58ba25 ed7ffa74

No related merge requests found

Changes 9

Show whitespace changes

Inline Side-by-side

Showing

build.gradle 20 additions, 8 deletions

build.gradle
src/main/java/emu/grasscutter/auth/ExternalAuthenticator.java 6 additions, 6 deletions

...main/java/emu/grasscutter/auth/ExternalAuthenticator.java
src/main/java/emu/grasscutter/scripts/constants/EventType.java 42 additions, 0 deletions

...ain/java/emu/grasscutter/scripts/constants/EventType.java
src/main/java/emu/grasscutter/scripts/constants/ScriptRegionShape.java 2 additions, 0 deletions

.../emu/grasscutter/scripts/constants/ScriptRegionShape.java
src/main/java/emu/grasscutter/server/event/game/ServerTickEvent.java 16 additions, 2 deletions

...va/emu/grasscutter/server/event/game/ServerTickEvent.java
src/main/java/emu/grasscutter/server/game/GameServer.java 52 additions, 38 deletions

src/main/java/emu/grasscutter/server/game/GameServer.java
src/main/java/emu/grasscutter/server/scheduler/AsyncServerTask.java 98 additions, 0 deletions

...ava/emu/grasscutter/server/scheduler/AsyncServerTask.java
src/main/java/emu/grasscutter/server/scheduler/ServerTask.java 67 additions, 0 deletions

...ain/java/emu/grasscutter/server/scheduler/ServerTask.java
src/main/java/emu/grasscutter/server/scheduler/ServerTaskScheduler.java 148 additions, 0 deletions

...emu/grasscutter/server/scheduler/ServerTaskScheduler.java

with 451 additions and 54 deletions

0% or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment