Merge branch 'development' into memetrollsXD-patch-1

2024-11-22 11:03:38 +00:00 · 2022-04-28 21:24:13 +02:00 · 2022-04-28 21:24:13 +02:00 · 56efeb2f8f
commit 56efeb2f8f
parent 8d1c571c0c 027bd28afb
55 changed files with 201267 additions and 200 deletions
--- a/.github/ISSUE_TEMPLATE/a_issue_report.md
+++ b/.github/ISSUE_TEMPLATE/a_issue_report.md
@ -0,0 +1,23 @@
+---
+name: Issues
+about: Create an issue if you need any help
+title: '[Issue] '
+labels: 'help wanted, question'
+assignees: ''
+
+---
+**Did you look for other closed issues that have the same problem?**
+<!--- It will be easier for us to solve your problem if there is less duplication of problems -->
+
+**Describe the issue**
+<!--- A clear and concise description of what the issue is. -->
+
+**Which branch did you use?**
+<!--- Stable branch / Development branch -->
+
+**Screenshots**
+<!--- If applicable, add screenshots to help explain your problem. -->
+
+**Additional context**
+<!--- Add any other context about the problem here. -->
+
--- a/.github/ISSUE_TEMPLATE/b_bug_report.md
+++ b/.github/ISSUE_TEMPLATE/b_bug_report.md
@ -0,0 +1,21 @@
+---
+name: Bug report
+about: Create a bug report to help us improve Grasscutter
+title: '[Bug] '
+labels: 'bug'
+assignees: ''
+
+---
+<!--- ONLY USE this form for bug reporting. If you need help or support, please USE issue report form instead. -->
+
+**Describe the bug**
+<!--- A clear and concise description of what the bug is. -->
+
+**Which branch did you use?**
+<!--- Stable branch / Development branch -->
+
+**Screenshots**
+<!--- If applicable, add screenshots to help explain your problem. -->
+
+**Additional context**
+<!--- Add any other context about the problem here. -->
--- a/.github/ISSUE_TEMPLATE/c_feature_request.md
+++ b/.github/ISSUE_TEMPLATE/c_feature_request.md
@ -0,0 +1,20 @@
+---
+name: Feature request
+about: Suggest an idea for Grasscutter
+title: '[Feature Request] '
+labels: 'enhancement, suggestion'
+assignees: ''
+
+---
+
+**Is your feature request related to a problem? Please describe.**
+<!--- A clear and concise description of what the problem is. Ex. I'm always frustrated when [...] -->
+
+**Describe the solution you'd like**
+<!--- A clear and concise description of what you want to happen. -->
+
+**Describe alternatives you've considered**
+<!--- A clear and concise description of any alternative solutions or features you've considered. -->
+
+**Additional context**
+<!--- Add any other context or screenshots about the feature request here. -->
--- a/.github/ISSUE_TEMPLATE/config.yml
+++ b/.github/ISSUE_TEMPLATE/config.yml
@ -0,0 +1,6 @@
+blank_issues_enabled: false
+contact_links:
+  - name: Grasscutter Discord
+    url: https://discord.gg/T5vZU6UyeG
+    about: For support, discuss and and other things with Grasscutter.
+ 
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@ -0,0 +1,22 @@
+## Description
+
+Please carefully read the [Contributing note](https://github.com/Grasscutters/Grasscutter/blob/stable/CONTRIBUTING.md) and [Code of conduct](https://github.com/Grasscutters/Grasscutter/blob/development/CODE_OF_CONDUCT.md) before making any pull requests.
+And, **Do not make a pull request to merge into stable unless it is a hotfix. Use the development branch instead.**
+## Issues fixed by this PR
+
+<!--- Put the links of issues that may be fixed by this PR here (if any). -->
+## Type of changes
+
+<!--- Put an `x` in all the boxes that apply your changes. -->
+
+- [ ] Bug fix
+- [ ] New feature 
+- [ ] Enhancement
+- [ ] Documentation
+
+## Checklist:
+
+- [ ] My code follows the style guidelines of this project
+- [ ] My pull request is unique and no other pull requests have been opened for these changes
+- [ ] I have read the [Contributing note](https://github.com/Grasscutters/Grasscutter/blob/stable/CONTRIBUTING.md) and [Code of conduct](https://github.com/Grasscutters/Grasscutter/blob/development/CODE_OF_CONDUCT.md)
+- [ ] I am responsible for any copyright issues with my code if it occurs in the future.
--- a/README.md
+++ b/README.md
@ -20,13 +20,13 @@ EN | [中文](README_zh-CN.md)

 ## Quick setup guide

-**Note:** for support please join our [Discord](https://discord.gg/T5vZU6UyeG)
+**Note:** For support please join our [Discord](https://discord.gg/T5vZU6UyeG).

 ### Requirements

-* Java SE - 17 ([mirror link](https://github.com/adoptium/temurin17-binaries/releases/tag/jdk-17.0.3+7) since Oracle required an account to download old builds)
+* Java SE - 17 ([link](https://www.oracle.com/java/technologies/javase/jdk17-archive-downloads.html))

-  **Note:** If you just want to **run it**, then **jre** is fine 
+  **Note:** If you just want to **run it**, then **jre** only is fine.

 * MongoDB (recommended 4.0+)

@ -34,12 +34,12 @@ EN | [中文](README_zh-CN.md)

 ### Running

-**Note:** If you update from an older version, delete `config.json` for regeneration
+**Note:** If you updated from an older version, delete `config.json` to regenerate it.

 1. Get `grasscutter.jar`
   - Download from [actions](https://nightly.link/Grasscutters/Grasscutter/workflows/build/stable/Grasscutter.zip)
   - [Build by yourself](#Building)
-2. Create a `resources` folder in the directory where grasscutter.jar is located and bring your `BinOutput` and `ExcelBinOutput` folders into it *(Check the [wiki](https://github.com/Grasscutters/Grasscutter/wiki) for more details how to get those.)*
+2. Create a `resources` folder in the directory where grasscutter.jar is located and move your `BinOutput` and `ExcelBinOutput` folders there *(Check the [wiki](https://github.com/Grasscutters/Grasscutter/wiki) for more details how to get those.)*
 3. Run Grasscutter with `java -jar grasscutter.jar`. **Make sure mongodb service is running as well.**

 ### Connecting with the client
@ -96,7 +96,7 @@ chmod +x gradlew
 ./gradlew jar # Compile
 ```

-You can find the output jar in the root of the project folder
+You can find the output jar in the root of the project folder.

 ## Commands

@ -106,33 +106,36 @@ There is a dummy user named "Server" in every player's friends list that you can

 | Commands       | Usage                                             | Permission node           | Availability | description                                                  | Alias                                           |
 | -------------- | ------------------------------------------------- | ------------------------- | ------------ | ------------------------------------------------------------ | ----------------------------------------------- |
-| account        | account <create\|delete> <username> [uid]         |                           | Server only  | Creates an account with the specified username and the in-game uid for that account. The uid will be auto generated if not set. |                                                 |
+| account        | account <create\|delete> <username> [UID]         |                           | Server only  | Creates an account with the specified username and the in-game UID for that account. The UID will be auto generated if not set. |                                                 |
 | broadcast      | broadcast <message>                               | server.broadcast          | Both side    | Sends a message to all the players.                          | b                                               |
+| coop           | coop <playerId> <target playerId>                 | server.coop               | Both side    | Forces someone to join the world of others.                  |                                                 |                                           
 | changescene    | changescene <scene id>                            | player.changescene        | Client only  | Switch scenes by scene ID.                                   | scene                                           |
-| clearartifacts | clearartifacts                                    | player.clearartifacts     | Client only  | Deletes all unequipped and unlocked level 0 artifacts, including yellow rarity ones from your inventory. | clearart                                        |
-| clearweapons   | clearweapons                                      | player.clearweapons       | Client only  | Deletes all unequipped and unlocked weapons, including yellow rarity ones from your inventory. | clearwpns                                       |
+| clearartifacts | clearartifacts                                    | player.clearartifacts     | Client only  | Deletes all unequipped and unlocked level 0 artifacts, including 5-star rarity ones from your inventory. | clearart                                        |
+| clearweapons   | clearweapons                                      | player.clearweapons       | Client only  | Deletes all unequipped and unlocked weapons, including 5-star rarity ones from your inventory. | clearwpns                                       |
 | drop           | drop <itemID\|itemName> [amount]                  | server.drop               | Client only  | Drops an item around you.                                    | `d` `dropitem`                                  |
 | give           | give [player] <itemId\|itemName> [amount] [level] | player.give               | Both side    | Gives item(s) to you or the specified player.                | `g` `item` `giveitem`                           |
-| givechar       | givechar <uid> <avatarId> [level]                 | player.givechar           | Both side    | Gives the player a specified character.                      | givec                                           |
+| givechar       | givechar <uid> <avatarId>                 | player.givechar           | Both side    | Gives the player a specified character.                      | givec                                           |
+| giveall       | giveall [uid] [amount]             | player.giveall      | Both side    | Gives all items.      | givea                                         |
 | godmode        | godmode [uid]                                     | player.godmode            | Client only  | Prevents you from taking damage.                             |                                                 |
-| heal           | heal                                              | player.heal               | Client only  | Heal all characters in your current team.                    | h                                               |
+| heal           | heal                                              | player.heal               | Client only  | Heals all characters in your current team.                    | h                                               |
 | help           | help [command]                                    |                           | Both side    | Sends the help message or shows information about a specified command. |                                                 |
 | kick           | kick <player>                                     | server.kick               | Both side    | Kicks the specified player from the server. (WIP)            | k                                               |
-| killall        | killall [playerUid] [sceneId]                     | server.killall            | Both side    | Kill all entities in the current scene or specified scene of the corresponding player. |                                                 |
-| list           | list                                              |                           | Both side    | List online players.                                         |                                                 |
+| killall        | killall [playerUid] [sceneId]                     | server.killall            | Both side    | Kills all entities in the current scene or specified scene of the corresponding player. |                                                 |
+| list           | list                                              |                           | Both side    | Lists online players.                                         |                                                 |
 | permission     | permission <add\|remove> <username> <permission>  | *                         | Both side    | Grants or removes a permission for a user.                   |                                                 |
-| position       | position                                          |                           | Client only  | Get coordinates.                                             | pos                                             |
-| reload         | reload                                            | server.reload             | Both side    | Reload server config                                         |                                                 |
-| resetconst     | resetconst [all]                                  | player.resetconstellation | Client only  | Resets the constellation level on your current active character, will need to relog after using the command to see any changes. | resetconstellation                              |
+| position       | position                                          |                           | Client only  | Sends your current coordinates.                                             | pos                                             |
+| reload         | reload                                            | server.reload             | Both side    | Reloads the server config                                         |                                                 |
+| resetconst     | resetconst [all]                                  | player.resetconstellation | Client only  | Resets the constellation level on your currently selected character, will need to relog after using the command to see any changes. | resetconstellation                              |
 | restart        |                                                   |                           | Both side    | Restarts the current session                                 |                                                 |
 | say            | say <player> <message>                            | server.sendmessage        | Both side    | Sends a message to a player as the server                    | `sendservmsg` `sendservermessage` `sendmessage` |
-| setfetterlevel | setfetterlevel <level>                            | player.setfetterlevel     | Client only  | Sets your fetter level for your current active character     | setfetterlvl                                    |
-| setstats       | setstats <stat> <value>                           | player.setstats           | Client only  | Set fight property for your current active character         | stats                                           |
+| setfetterlevel | setfetterlevel <level>                            | player.setfetterlevel     | Client only  | Sets the friendship level for your currently selected character     | setfetterlvl                                    |
+| setstats       | setstats <stat> <value>                           | player.setstats           | Client only  | Sets a stat for your currently selected character         | stats                                           |
 | setworldlevel  | setworldlevel <level>                             | player.setworldlevel      | Client only  | Sets your world level (Relog to see proper effects)          | setworldlvl                                     |
 | spawn          | spanw <entityID\|entityName> [level] [amount]     | server.spawn              | Client only  | Spawns an entity near you                                    |                                                 |
 | stop           | stop                                              | server.stop               | Both side    | Stops the server                                             |                                                 |
-| talent         | talent <talentID> <value>                         | player.settalent          | Client only  | Set talent level for your current active character           |                                                 |
+| talent         | talent <talentID> <value>                         | player.settalent          | Client only  | Sets talent level for your currently selected character           |                                                 |
 | teleport       | teleport <x> <y> <z>                              | player.teleport           | Client only  | Change the player's position.                                | tp                                              |
+| tpall          |                                                   | player.tpall              | Client only  | Teleports all players in your world to your position         |                                                 |
 | weather        | weather <weatherID> <climateID>                   | player.weather            | Client only  | Changes the weather                                          | w                                               |

 ### Bonus
@ -147,4 +150,5 @@ You can also specify a set Y coordinate by renaming the map marker.
 * If compiling wasn't successful, please check your JDK installation (JDK 17 and validated JDK's bin PATH variable)
 * My client doesn't connect, doesn't login, 4206, etc... - Mostly your proxy daemon setup is *the issue*, if using
  Fiddler make sure it running on another port except 8888
+
 * Startup sequence: Mongodb > Grasscutter > Proxy daemon (mitmdump, fiddler, etc.) > Game
--- a/README_zh-CN.md
+++ b/README_zh-CN.md
@ -109,12 +109,14 @@ chmod +x gradlew
 | -------------- | -------------------------------------------- | ------------------------- | -------- | ------------------------------------------ | ----------------------------------------------- |
 | account        | account <create\|delete> <用户名> [uid]      |                           | 仅服务端 | 通过指定用户名和uid增删账户                |                                                 |
 | broadcast      | broadcast <消息内容>                         | server.broadcast          | 均可使用 | 给所有玩家发送公告                         | b                                               |
+| coop           | coop <uid> <目标uid>                 | server.coop               | 均可使用    | 强制某位玩家进入指定玩家的多人世界                  |                                                 |
 | changescene    | changescene <场景ID>                         | player.changescene        | 仅客户端 | 切换到指定场景                             | scene                                           |
 | clearartifacts | clearartifacts                               | player.clearartifacts     | 仅客户端 | 删除所有未装备及未解锁的圣遗物,包括五星    | clearart                                        |
 | clearweapons   | clearweapons                                 | player.clearweapons       | 仅客户端 | 删除所有未装备及未解锁的武器,包括五星      | clearwp                                         |
 | drop           | drop <物品ID\|物品名称> [数量]               | server.drop               | 仅客户端 | 在指定玩家周围掉落指定物品                 | `d` `dropitem`                                  |
 | give           | give [uid] <物品ID\|物品名称> [数量] [等级]  |                           |          | 给予指定玩家一定数量及等级的物品           | `g` `item` `giveitem`                           |
 | givechar       | givechar <uid> <角色ID> [等级]               | player.givechar           | 均可使用 | 给予指定玩家对应角色                       | givec                                           |
+| giveall        | giveall [uid] [数量]                         | player.giveall            | 均可使用 | 给予指定玩家全部物品                       | givea                                           |
 | godmode        | godmode [uid]                                | player.godmode            | 仅客户端 | 保护你不受到任何伤害(依然会被击退)         |                                                 |
 | heal           | heal                                         | player.heal               | 仅客户端 | 治疗队伍中所有角色                         | h                                               |
 | help           | help [命令]                                  |                           | 均可使用 | 显示帮助或展示指定命令的帮助               |                                                 |
@ -134,6 +136,7 @@ chmod +x gradlew
 | stop           | stop                                         | server.stop               | 均可使用 | 停止服务器                                 |                                                 |
 | talent         | talent <天赋ID> <等级>                       | player.settalent          | 仅客户端 | 设置当前角色的天赋等级                     |                                                 |
 | teleport       | teleport <x> <y> <z>                         | player.teleport           | 仅客户端 | 传送玩家到指定坐标                         | tp                                              |
+| tpall          |                                                   | player.tpall              | 仅客户端  | 传送多人世界中所有的玩家到自身地点         |                                                 |
 | weather        | weather <天气ID> <气候ID>                    | player.weather            | 仅客户端 | 改变天气                                   | w                                               |

 ### 额外功能
--- a/data/Drop.json
+++ b/data/Drop.json
--- a/data/Shop.json
+++ b/data/Shop.json
@ -0,0 +1,54 @@
+[
+  {
+    "shopId": 1004,
+    "items": [
+      {
+        "goodsId": 1004202,
+        "goodsItem": {
+          "Id": 202,
+          "Count": 1000000
+        },
+        "scoin": 1,
+        "buyLimit": 500,
+        "beginTime": 1575129600,
+        "endTime": 2051193600,
+        "minLevel": 1,
+        "maxLevel": 99,
+        "costItemList": [
+          {
+            "Id": 223,
+            "Count": 100
+          }
+        ]
+      },
+      {
+        "goodsId": 10048006,
+        "goodsItem": {
+          "Id": 108006,
+          "Count": 20
+        },
+        "scoin": 100,
+        "hcoin": 100,
+        "mcoin": 100,
+        "buyLimit": 50000,
+        "beginTime": 1575129600,
+        "endTime": 2051193600,
+        "minLevel": 1,
+        "maxLevel": 99
+      },
+      {
+        "goodsId": 10048033,
+        "goodsItem": {
+          "Id": 108033,
+          "Count": 20
+        },
+        "scoin": 1,
+        "buyLimit": 50000,
+        "beginTime": 1575129600,
+        "endTime": 2051193600,
+        "minLevel": 1,
+        "maxLevel": 99
+      }
+    ]
+  }
+]
--- a/src/main/java/emu/grasscutter/Config.java
+++ b/src/main/java/emu/grasscutter/Config.java
@ -33,6 +33,7 @@ public final class Config {
 		public Boolean FrontHTTPS = true;

 		public boolean AutomaticallyCreateAccounts = false;
+		public String[] defaultPermissions = new String[] { "" };

 		public RegionInfo[] GameServers = {};

--- a/src/main/java/emu/grasscutter/command/commands/AccountCommand.java
+++ b/src/main/java/emu/grasscutter/command/commands/AccountCommand.java
@ -1,5 +1,6 @@
 package emu.grasscutter.command.commands;

+import emu.grasscutter.Grasscutter;
 import emu.grasscutter.command.Command;
 import emu.grasscutter.command.CommandHandler;
 import emu.grasscutter.database.DatabaseHelper;
@ -7,8 +8,7 @@ import emu.grasscutter.game.player.Player;

 import java.util.List;

-@Command(label = "account", usage = "account <create|delete> <username> [uid]",
-        description = "Modify user accounts")
+@Command(label = "account", usage = "account <create|delete> <username> [uid]", description = "Modify user accounts")
 public final class AccountCommand implements CommandHandler {

    @Override
@ -46,9 +46,10 @@ public final class AccountCommand implements CommandHandler {
                    CommandHandler.sendMessage(null, "Account already exists.");
                    return;
                } else {
-                    CommandHandler.sendMessage(null, "Account created with UID " + account.getPlayerUid() + ".");
-                    account.addPermission("*"); // Grant the player superuser permissions.
+                    account.addPermission("*");
                    account.save(); // Save account to database.
+
+                    CommandHandler.sendMessage(null, "Account created with UID " + account.getPlayerUid() + ".");
                }
                return;
            case "delete":
--- a/src/main/java/emu/grasscutter/command/commands/CoopCommand.java
+++ b/src/main/java/emu/grasscutter/command/commands/CoopCommand.java
@ -0,0 +1,36 @@
+package emu.grasscutter.command.commands;
+
+import emu.grasscutter.command.Command;
+import emu.grasscutter.command.CommandHandler;
+import emu.grasscutter.game.player.Player;
+
+import java.util.List;
+
+@Command(label = "coop", usage = "coop",
+        description = "Forces someone to join the world of others", permission = "server.coop")
+public class CoopCommand implements CommandHandler {
+    @Override
+    public void execute(Player sender, List<String> args) {
+        if (args.size() < 2) {
+            CommandHandler.sendMessage(sender, "Usage: coop <playerId> <target playerId>");
+            return;
+        }
+        try {
+            int tid = Integer.parseInt(args.get(0));
+            int hostId = Integer.parseInt(args.get(1));
+            Player host = sender.getServer().getPlayerByUid(hostId);
+            Player want = sender.getServer().getPlayerByUid(tid);
+            if (host == null || want == null) {
+                CommandHandler.sendMessage(sender, "Player is offline.");
+                return;
+            }
+            if (want.isInMultiplayer()) {
+                sender.getServer().getMultiplayerManager().leaveCoop(want);
+            }
+            sender.getServer().getMultiplayerManager().applyEnterMp(want, hostId);
+            sender.getServer().getMultiplayerManager().applyEnterMpReply(host, tid, true);
+        } catch (Exception e) {
+            CommandHandler.sendMessage(sender, "Player id is not valid.");
+        }
+    }
+}
--- a/src/main/java/emu/grasscutter/command/commands/GiveAllCommand.java
+++ b/src/main/java/emu/grasscutter/command/commands/GiveAllCommand.java
@ -13,7 +13,7 @@ import emu.grasscutter.game.player.Player;

 import java.util.*;

-@Command(label = "giveall", usage = "giveall [player] <amount>",
+@Command(label = "giveall", usage = "giveall [player] [amount]",
        description = "Gives all items", aliases = {"givea"}, permission = "player.giveall", threading = true)
 public class GiveAllCommand implements CommandHandler {

@ -59,7 +59,7 @@ public class GiveAllCommand implements CommandHandler {
                break;

            default: // invalid
-                CommandHandler.sendMessage(null, "Usage: giveall [player] <amount>");
+                CommandHandler.sendMessage(null, "Usage: giveall [player] [amount]");
                return;
        }

@ -142,7 +142,7 @@ public class GiveAllCommand implements CommandHandler {
            }
        }

-        if (testItemsList.contains(itemId)) {
+       if (testItemsList.contains(itemId)) {
            return true;
        }

@ -175,7 +175,6 @@ public class GiveAllCommand implements CommandHandler {
            new Range(2017, 2029),
          //  new Range(108001, 108387) //food
    };
-
    private static final Integer[] testItemsIds = new Integer[] {
            210, 211, 314, 315, 317, 1005, 1007, 1105, 1107, 1201, 1202, 2800,
            100001, 100002, 100244, 100305, 100312, 100313, 101212, 11411, 11506, 11507, 11508, 12505,
--- a/src/main/java/emu/grasscutter/command/commands/KillAllCommand.java
+++ b/src/main/java/emu/grasscutter/command/commands/KillAllCommand.java
@ -4,6 +4,7 @@ import emu.grasscutter.Grasscutter;
 import emu.grasscutter.command.Command;
 import emu.grasscutter.command.CommandHandler;
 import emu.grasscutter.game.entity.EntityMonster;
+import emu.grasscutter.game.entity.GameEntity;
 import emu.grasscutter.game.player.Player;
 import emu.grasscutter.game.world.Scene;

@ -53,10 +54,12 @@ public final class KillAllCommand implements CommandHandler {
                    return;
            }

-            mainScene.getEntities().values().stream()
+            // Separate into list to avoid concurrency issue
+            List<GameEntity> toKill = mainScene.getEntities().values().stream()
                    .filter(entity -> entity instanceof EntityMonster)
-                    .forEach(entity -> mainScene.killEntity(entity, 0));
-            CommandHandler.sendMessage(sender, "Killing all monsters in scene " + mainScene.getId());
+                    .toList();
+            toKill.stream().forEach(entity -> mainScene.killEntity(entity, 0));
+            CommandHandler.sendMessage(sender, "Killing " + toKill.size() + " monsters in scene " + mainScene.getId());
        } catch (NumberFormatException ignored) {
            CommandHandler.sendMessage(sender, "Invalid arguments.");
        }
--- a/src/main/java/emu/grasscutter/command/commands/ReloadCommand.java
+++ b/src/main/java/emu/grasscutter/command/commands/ReloadCommand.java
@ -16,6 +16,8 @@ public final class ReloadCommand implements CommandHandler {
        CommandHandler.sendMessage(sender, "Reloading config.");
        Grasscutter.loadConfig();
        Grasscutter.getGameServer().getGachaManager().load();
+        Grasscutter.getGameServer().getDropManager().load();
+        Grasscutter.getGameServer().getShopManager().load();
        Grasscutter.getDispatchServer().loadQueries();
        CommandHandler.sendMessage(sender, "Reload complete.");
    }
--- a/src/main/java/emu/grasscutter/command/commands/TpallCommand.java
+++ b/src/main/java/emu/grasscutter/command/commands/TpallCommand.java
@ -0,0 +1,31 @@
+package emu.grasscutter.command.commands;
+
+import emu.grasscutter.command.Command;
+import emu.grasscutter.command.CommandHandler;
+import emu.grasscutter.game.player.Player;
+import emu.grasscutter.utils.Position;
+
+import java.util.List;
+
+@Command(label = "tpall", usage = "tpall",
+        description = "Teleports all players in your world to your position", permission = "player.tpall")
+public class TpallCommand implements CommandHandler {
+    @Override
+    public void execute(Player sender, List<String> args) {
+        if (sender == null) {
+            CommandHandler.sendMessage(null, "Run this command in-game.");
+            return;
+        }
+        if (!sender.getWorld().isMultiplayer()) {
+            CommandHandler.sendMessage(sender, "You only can use this command in MP mode.");
+            return;
+        }
+        for (Player gp : sender.getWorld().getPlayers()) {
+            if (gp.equals(sender))
+                continue;
+            Position pos = sender.getPos();
+
+            gp.getWorld().transferPlayerToScene(gp, sender.getSceneId(), pos);
+        }
+    }
+}
--- a/src/main/java/emu/grasscutter/data/def/GadgetData.java
+++ b/src/main/java/emu/grasscutter/data/def/GadgetData.java
@ -8,13 +8,14 @@ public class GadgetData extends GameResource {
 	private int Id;
 	
 	private String Type;
-    private String JsonName;
-    private boolean IsInteractive;
-    private String[] Tags;
-    private String ItemJsonName;
-    private String InteeIconName;
-    private long NameTextMapHash;
-    private int CampID;
+	private String JsonName;
+	private boolean IsInteractive;
+	private String[] Tags;
+	private String ItemJsonName;
+	private String InteeIconName;
+	private long NameTextMapHash;
+	private int CampID;
+	private String LODPatternName;

 	@Override
 	public int getId() {
@ -53,6 +54,8 @@ public class GadgetData extends GameResource {
 		return CampID;
 	}

+	public String getLODPatternName() { return LODPatternName; }
+
 	@Override
 	public void onLoad() {

--- a/src/main/java/emu/grasscutter/game/drop/DropData.java
+++ b/src/main/java/emu/grasscutter/game/drop/DropData.java
@ -0,0 +1,55 @@
+package emu.grasscutter.game.drop;
+
+public class DropData {
+    private int minWeight;
+    private int maxWeight;
+    private int itemId;
+    private int minCount;
+    private int maxCount;
+    private boolean share = false;
+    private boolean give = false;
+
+    public boolean isGive() {
+        return give;
+    }
+
+    public void setGive(boolean give) {
+        this.give = give;
+    }
+
+    public int getItemId() {
+        return itemId;
+    }
+
+    public void setItemId(int itemId) {
+        this.itemId = itemId;
+    }
+
+    public int getMinCount() {
+        return minCount;
+    }
+
+
+    public int getMaxCount() {
+        return maxCount;
+    }
+
+
+    public int getMinWeight() {
+        return minWeight;
+    }
+
+    public int getMaxWeight() {
+        return maxWeight;
+    }
+
+
+    public boolean isShare() {
+        return share;
+    }
+
+    public void setIsShare(boolean share) {
+        this.share = share;
+    }
+
+}
--- a/src/main/java/emu/grasscutter/game/drop/DropInfo.java
+++ b/src/main/java/emu/grasscutter/game/drop/DropInfo.java
@ -0,0 +1,16 @@
+package emu.grasscutter.game.drop;
+
+import java.util.List;
+
+public class DropInfo {
+    public int getMonsterId() {
+        return monsterId;
+    }
+
+    public List<DropData> getDropDataList() {
+        return dropDataList;
+    }
+
+    private int monsterId;
+    private List<DropData> dropDataList;
+}
--- a/src/main/java/emu/grasscutter/game/drop/DropManager.java
+++ b/src/main/java/emu/grasscutter/game/drop/DropManager.java
@ -0,0 +1,116 @@
+package emu.grasscutter.game.drop;
+
+import com.google.gson.reflect.TypeToken;
+import emu.grasscutter.Grasscutter;
+import emu.grasscutter.data.GameData;
+import emu.grasscutter.data.def.ItemData;
+import emu.grasscutter.game.entity.EntityItem;
+import emu.grasscutter.game.entity.EntityMonster;
+import emu.grasscutter.game.inventory.GameItem;
+import emu.grasscutter.game.inventory.ItemType;
+import emu.grasscutter.game.player.Player;
+import emu.grasscutter.game.props.ActionReason;
+import emu.grasscutter.game.world.Scene;
+import emu.grasscutter.server.game.GameServer;
+import emu.grasscutter.utils.Position;
+import emu.grasscutter.utils.Utils;
+import it.unimi.dsi.fastutil.ints.Int2ObjectMap;
+import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap;
+
+import java.io.FileReader;
+import java.util.Collection;
+import java.util.List;
+
+public class DropManager {
+    public GameServer getGameServer() {
+        return gameServer;
+    }
+
+    private final GameServer gameServer;
+
+    public Int2ObjectMap<List<DropData>> getDropData() {
+        return dropData;
+    }
+
+    private final Int2ObjectMap<List<DropData>> dropData;
+
+    public DropManager(GameServer gameServer) {
+        this.gameServer = gameServer;
+        this.dropData = new Int2ObjectOpenHashMap<>();
+        this.load();
+    }
+
+    public synchronized void load() {
+        try (FileReader fileReader = new FileReader(Grasscutter.getConfig().DATA_FOLDER + "Drop.json")) {
+            getDropData().clear();
+            List<DropInfo> banners = Grasscutter.getGsonFactory().fromJson(fileReader, TypeToken.getParameterized(Collection.class, DropInfo.class).getType());
+            if(banners.size() > 0) {
+                for (DropInfo di : banners) {
+                    getDropData().put(di.getMonsterId(), di.getDropDataList());
+                }
+                Grasscutter.getLogger().info("Drop data successfully loaded.");
+            } else {
+                Grasscutter.getLogger().error("Unable to load drop data. Drop data size is 0.");
+            }
+        } catch (Exception e) {
+            // TODO Auto-generated catch block
+            e.printStackTrace();
+        }
+    }
+    private void addDropEntity(DropData dd, Scene dropScene, ItemData itemData, Position pos, int num, Player target) {
+        if (!dd.isGive() && (itemData.getItemType() != ItemType.ITEM_VIRTUAL || itemData.getGadgetId() != 0)) {
+            EntityItem entity = new EntityItem(dropScene, target, itemData, pos, num, dd.isShare());
+            if (!dd.isShare())
+                dropScene.addEntityToSingleClient(target, entity);
+            else
+                dropScene.addEntity(entity);
+        } else {
+            if (target != null) {
+                target.getInventory().addItem(new GameItem(itemData, num), ActionReason.SubfieldDrop, true);
+            } else {
+                // target is null if items will be added are shared. no one could pick it up because of the combination(give + shared)
+                // so it will be sent to all players' inventories directly.
+                dropScene.getPlayers().forEach(x -> {
+                    x.getInventory().addItem(new GameItem(itemData, num), ActionReason.SubfieldDrop, true);
+                });
+            }
+        }
+    }
+
+    private void processDrop(DropData dd, EntityMonster em, Player gp) {
+        int target = Utils.randomRange(1, 10000);
+        if (target >= dd.getMinWeight() && target < dd.getMaxWeight()) {
+            ItemData itemData = GameData.getItemDataMap().get(dd.getItemId());
+            int num = Utils.randomRange(dd.getMinCount(), dd.getMaxCount());
+
+            if (itemData == null) {
+                return;
+            }
+            if (itemData.isEquip()) {
+                for (int i = 0; i < num; i++) {
+                    float range = (5f + (.1f * num));
+                    Position pos = em.getPosition().clone().addX((float) (Math.random() * range) - (range / 2)).addY(3f).addZ((float) (Math.random() * range) - (range / 2));
+                    addDropEntity(dd, em.getScene(), itemData, pos, num, gp);
+                }
+            } else {
+                Position pos = em.getPosition().clone().addY(3f);
+                addDropEntity(dd, em.getScene(), itemData, pos, num, gp);
+            }
+        }
+    }
+
+    public void callDrop(EntityMonster em) {
+        int id = em.getMonsterData().getId();
+        if (getDropData().containsKey(id)) {
+            for (DropData dd : getDropData().get(id)) {
+                if (dd.isShare())
+                    processDrop(dd, em, null);
+                else {
+                    for (Player gp : em.getScene().getPlayers()) {
+                        processDrop(dd, em, gp);
+                    }
+                }
+            }
+        }
+    }
+}
--- a/src/main/java/emu/grasscutter/game/entity/EntityItem.java
+++ b/src/main/java/emu/grasscutter/game/entity/EntityItem.java
@ -6,7 +6,6 @@ import emu.grasscutter.game.player.Player;
 import emu.grasscutter.game.props.EntityIdType;
 import emu.grasscutter.game.props.PlayerProperty;
 import emu.grasscutter.game.world.Scene;
-import emu.grasscutter.game.world.World;
 import emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfo;
 import emu.grasscutter.net.proto.AnimatorParameterValueInfoPairOuterClass.AnimatorParameterValueInfoPair;
 import emu.grasscutter.net.proto.EntityAuthorityInfoOuterClass.EntityAuthorityInfo;
@ -31,13 +30,29 @@ public class EntityItem extends EntityGadget {
 	private final GameItem item;
 	private final long guid;

+	private final boolean share;
+
 	public EntityItem(Scene scene, Player player, ItemData itemData, Position pos, int count) {
 		super(scene);
 		this.id = getScene().getWorld().getNextEntityId(EntityIdType.GADGET);
 		this.pos = new Position(pos);
 		this.rot = new Position();
-		this.guid = player.getNextGameGuid();
+		this.guid = player == null ? scene.getWorld().getHost().getNextGameGuid() : player.getNextGameGuid();
 		this.item = new GameItem(itemData, count);
+		this.share = true;
+	}
+
+	// In official game, some drop items are shared to all players, and some other items are independent to all players
+	// For example, if you killed a monster in MP mode, all players could get drops but rarity and number of them are different
+	// but if you broke regional mine, when someone picked up the drop then it disappeared
+	public EntityItem(Scene scene, Player player, ItemData itemData, Position pos, int count, boolean share) {
+		super(scene);
+		this.id = getScene().getWorld().getNextEntityId(EntityIdType.GADGET);
+		this.pos = new Position(pos);
+		this.rot = new Position();
+		this.guid = player == null ? scene.getWorld().getHost().getNextGameGuid() : player.getNextGameGuid();
+		this.item = new GameItem(itemData, count);
+		this.share = share;
 	}
 	
 	@Override
@ -81,6 +96,10 @@ public class EntityItem extends EntityGadget {
 		return null;
 	}

+	public boolean isShare() {
+		return share;
+	}
+
 	@Override
 	public SceneEntityInfo toProto() {
 		EntityAuthorityInfo authority = EntityAuthorityInfo.newBuilder()
--- a/src/main/java/emu/grasscutter/game/entity/EntityVehicle.java
+++ b/src/main/java/emu/grasscutter/game/entity/EntityVehicle.java
@ -0,0 +1,124 @@
+package emu.grasscutter.game.entity;
+
+import emu.grasscutter.game.player.Player;
+import emu.grasscutter.game.props.EntityIdType;
+import emu.grasscutter.game.props.PlayerProperty;
+import emu.grasscutter.game.world.Scene;
+
+import emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfo;
+import emu.grasscutter.net.proto.AnimatorParameterValueInfoPairOuterClass.AnimatorParameterValueInfoPair;
+import emu.grasscutter.net.proto.EntityAuthorityInfoOuterClass.EntityAuthorityInfo;
+import emu.grasscutter.net.proto.EntityRendererChangedInfoOuterClass.EntityRendererChangedInfo;
+import emu.grasscutter.net.proto.FightPropPairOuterClass.*;
+import emu.grasscutter.net.proto.MotionInfoOuterClass.MotionInfo;
+import emu.grasscutter.net.proto.PropPairOuterClass.PropPair;
+import emu.grasscutter.net.proto.ProtEntityTypeOuterClass.ProtEntityType;
+import emu.grasscutter.net.proto.SceneEntityAiInfoOuterClass.SceneEntityAiInfo;
+import emu.grasscutter.net.proto.SceneEntityInfoOuterClass.SceneEntityInfo;
+import emu.grasscutter.net.proto.SceneGadgetInfoOuterClass.SceneGadgetInfo;
+import emu.grasscutter.net.proto.VectorOuterClass.Vector;
+import emu.grasscutter.net.proto.VehicleInfoOuterClass.*;
+
+import emu.grasscutter.utils.Position;
+import emu.grasscutter.utils.ProtoHelper;
+
+import it.unimi.dsi.fastutil.ints.Int2FloatMap;
+import it.unimi.dsi.fastutil.ints.Int2FloatOpenHashMap;
+
+public class EntityVehicle extends EntityGadget {
+	private final Player owner;
+	private final Int2FloatOpenHashMap fightProp;
+
+	private final Position pos;
+	private final Position rot;
+
+	private float curStamina;
+	private final int pointId;
+	private final int gadgetId;
+
+	public EntityVehicle(Scene scene, Player player, int gadgetId, int pointId, Position pos, Position rot) {
+		super(scene);
+		this.owner = player;
+		this.id = getScene().getWorld().getNextEntityId(EntityIdType.GADGET);
+		this.fightProp = new Int2FloatOpenHashMap();
+		this.pos = new Position(pos);
+		this.rot = new Position(rot);
+		this.gadgetId = gadgetId;
+		this.pointId = pointId;
+		this.curStamina = 240;
+	}
+
+	@Override
+	public int getGadgetId() { return gadgetId; }
+
+	public Player getOwner() {
+		return owner;
+	}
+
+	public float getCurStamina() { return curStamina; }
+
+	public void setCurStamina(float stamina) { this.curStamina = stamina; }
+
+	public int getPointId() { return pointId; }
+
+	@Override
+	public Int2FloatOpenHashMap getFightProperties() {
+		return fightProp;
+	}
+
+	@Override
+	public Position getPosition() { return this.pos; }
+
+	@Override
+	public Position getRotation() {
+		return this.rot;
+	}
+
+	@Override
+	public SceneEntityInfo toProto() {
+
+		VehicleInfo vehicle = VehicleInfo.newBuilder()
+				.setOwnerUid(this.owner.getUid())
+				.setCurStamina(getCurStamina())
+				.build();
+
+		EntityAuthorityInfo authority = EntityAuthorityInfo.newBuilder()
+				.setAbilityInfo(AbilitySyncStateInfo.newBuilder())
+				.setRendererChangedInfo(EntityRendererChangedInfo.newBuilder())
+				.setAiInfo(SceneEntityAiInfo.newBuilder().setIsAiOpen(true).setBornPos(getPosition().toProto()))
+				.setBornPos(getPosition().toProto())
+				.build();
+
+		SceneGadgetInfo.Builder gadgetInfo = SceneGadgetInfo.newBuilder()
+				.setGadgetId(this.getGadgetId())
+				.setAuthorityPeerId(this.getOwner().getPeerId())
+				.setIsEnableInteract(true)
+				.setVehicleInfo(vehicle);
+
+		SceneEntityInfo.Builder entityInfo = SceneEntityInfo.newBuilder()
+				.setEntityId(getId())
+				.setEntityType(ProtEntityType.PROT_ENTITY_GADGET)
+				.setMotionInfo(MotionInfo.newBuilder().setPos(getPosition().toProto()).setRot(getRotation().toProto()).setSpeed(Vector.newBuilder()))
+				.addAnimatorParaList(AnimatorParameterValueInfoPair.newBuilder())
+				.setGadget(gadgetInfo)
+				.setEntityAuthorityInfo(authority)
+				.setLifeState(1);
+
+		PropPair pair = PropPair.newBuilder()
+				.setType(PlayerProperty.PROP_LEVEL.getId())
+				.setPropValue(ProtoHelper.newPropValue(PlayerProperty.PROP_LEVEL, 47))
+				.build();
+
+		for (Int2FloatMap.Entry entry : getFightProperties().int2FloatEntrySet()) {
+			if (entry.getIntKey() == 0) {
+				continue;
+			}
+			FightPropPair fightProp = FightPropPair.newBuilder().setPropType(entry.getIntKey()).setPropValue(entry.getFloatValue()).build();
+			entityInfo.addFightPropList(fightProp);
+		}
+
+		entityInfo.addPropList(pair);
+
+		return entityInfo.build();
+	}
+}
--- a/src/main/java/emu/grasscutter/game/friends/Friendship.java
+++ b/src/main/java/emu/grasscutter/game/friends/Friendship.java
@ -8,7 +8,7 @@ import emu.grasscutter.database.DatabaseHelper;
 import emu.grasscutter.game.player.Player;
 import emu.grasscutter.net.proto.FriendBriefOuterClass.FriendBrief;
 import emu.grasscutter.net.proto.FriendOnlineStateOuterClass.FriendOnlineState;
-import emu.grasscutter.net.proto.HeadImageOuterClass.HeadImage;
+import emu.grasscutter.net.proto.ProfilePictureOuterClass.ProfilePicture;

@Entity(value = "friendships", useDiscriminator = false)
 public class Friendship {
@ -92,7 +92,7 @@ public class Friendship {
 				.setUid(getFriendProfile().getUid())
 				.setNickname(getFriendProfile().getName())
 				.setLevel(getFriendProfile().getPlayerLevel())
-				.setAvatarId(HeadImage.newBuilder().setAvatarId(getFriendProfile().getAvatarId()).getAvatarId())
+				.setProfilePicture(ProfilePicture.newBuilder().setAvatarId(getFriendProfile().getAvatarId()))
 				.setWorldLevel(getFriendProfile().getWorldLevel())
 				.setSignature(getFriendProfile().getSignature())
 				.setOnlineState(getFriendProfile().isOnline() ? FriendOnlineState.FRIEND_ONLINE : FriendOnlineState.FREIEND_DISCONNECT)
--- a/src/main/java/emu/grasscutter/game/gacha/GachaBanner.java
+++ b/src/main/java/emu/grasscutter/game/gacha/GachaBanner.java
@ -16,8 +16,8 @@ public class GachaBanner {
 	private int sortId;
 	private int[] rateUpItems1;
 	private int[] rateUpItems2;
-	private int minItemType = 1;
-	private int maxItemType = 2;
+	private int baseYellowWeight = 60; // Max 10000
+	private int basePurpleWeight = 510; // Max 10000
 	private int eventChance = 50; // Chance to win a featured event item
 	private int softPity = 75;
 	private int hardPity = 90;
@ -63,6 +63,14 @@ public class GachaBanner {
 		return sortId;
 	}

+	public int getBaseYellowWeight() {
+		return baseYellowWeight;
+	}
+
+	public int getBasePurpleWeight() {
+		return basePurpleWeight;
+	}
+
 	public int[] getRateUpItems1() {
 		return rateUpItems1;
 	}
@ -71,14 +79,6 @@ public class GachaBanner {
 		return rateUpItems2;
 	}
 	
-	public int getMinItemType() {
-		return minItemType;
-	}
-	
-	public int getMaxItemType() {
-		return maxItemType;
-	}
-	
 	public int getSoftPity() {
 		return softPity - 1;
 	}
--- a/src/main/java/emu/grasscutter/game/gacha/GachaManager.java
+++ b/src/main/java/emu/grasscutter/game/gacha/GachaManager.java
@ -15,6 +15,7 @@ import emu.grasscutter.Grasscutter;
 import emu.grasscutter.data.GameData;
 import emu.grasscutter.data.def.ItemData;
 import emu.grasscutter.game.avatar.Avatar;
+import emu.grasscutter.game.gacha.GachaBanner.BannerType;
 import emu.grasscutter.game.inventory.GameItem;
 import emu.grasscutter.game.inventory.ItemType;
 import emu.grasscutter.game.inventory.MaterialType;
@ -125,8 +126,8 @@ public class GachaManager {
 			int itemId = 0;
 			
 			int bonusYellowChance = gachaInfo.getPity5() >= banner.getSoftPity() ? 100 * (gachaInfo.getPity5() - banner.getSoftPity() - 1): 0;
-			int yellowChance = 60 + (int) Math.floor(100f * (gachaInfo.getPity5() / (banner.getSoftPity() - 1D))) + bonusYellowChance;
-			int purpleChance = 10000 - (510 + (int) Math.floor(790f * (gachaInfo.getPity4() / 8f)));
+			int yellowChance = banner.getBaseYellowWeight() + (int) Math.floor(100f * (gachaInfo.getPity5() / (banner.getSoftPity() - 1D))) + bonusYellowChance;
+			int purpleChance = 10000 - (banner.getBasePurpleWeight() + (int) Math.floor(790f * (gachaInfo.getPity4() / 8f)));
 		
 			if (random <= yellowChance || gachaInfo.getPity5() >= banner.getHardPity()) {
 				if (banner.getRateUpItems1().length > 0) {
@ -142,7 +143,7 @@ public class GachaManager {
 				}
 				
 				if (itemId == 0) {
-					int typeChance = this.randomRange(banner.getMinItemType(), banner.getMaxItemType());
+					int typeChance = this.randomRange(banner.getBannerType() == BannerType.WEAPON ? 2 : 1, banner.getBannerType() == BannerType.EVENT ? 1 : 2);
 					if (typeChance == 1) {
 						itemId = getRandom(this.yellowAvatars);
 					} else {
@ -163,7 +164,7 @@ public class GachaManager {
 				}
 				
 				if (itemId == 0) {
-					int typeChance = this.randomRange(banner.getMinItemType(), banner.getMaxItemType());
+					int typeChance = this.randomRange(banner.getBannerType() == BannerType.WEAPON ? 2 : 1, banner.getBannerType() == BannerType.EVENT ? 1 : 2);
 					if (typeChance == 1) {
 						itemId = getRandom(this.purpleAvatars);
 					} else {
--- a/src/main/java/emu/grasscutter/game/inventory/Inventory.java
+++ b/src/main/java/emu/grasscutter/game/inventory/Inventory.java
@ -110,6 +110,16 @@ public class Inventory implements Iterable<GameItem> {
 		return result;
 	}

+	public boolean addItem(GameItem item, ActionReason reason, boolean forceNotify) {
+		boolean result = addItem(item);
+
+		if (reason != null && (forceNotify || result)) {
+			getPlayer().sendPacket(new PacketItemAddHintNotify(item, reason));
+		}
+
+		return result;
+	}
+	
 	public void addItems(Collection<GameItem> items) {
 		this.addItems(items, null);
 	}
@ -158,7 +168,7 @@ public class Inventory implements Iterable<GameItem> {
 		} else if (type == ItemType.ITEM_VIRTUAL) {
 			// Handle
 			this.addVirtualItem(item.getItemId(), item.getCount());
-			return null;
+			return item;
 		} else if (item.getItemData().getMaterialType() == MaterialType.MATERIAL_AVATAR) {
 			// Get avatar id
 			int avatarId = (item.getItemId() % 1000) + 10000000;
@ -208,7 +218,8 @@ public class Inventory implements Iterable<GameItem> {
 		}
 		
 		// Set ownership and save to db
-		item.save();
+		if (item.getItemData().getItemType() != ItemType.ITEM_VIRTUAL)
+			item.save();
 		
 		return item;
 	}
@ -226,19 +237,23 @@ public class Inventory implements Iterable<GameItem> {
 	private void addVirtualItem(int itemId, int count) {
 		switch (itemId) {
 			case 101: // Character exp
-				for (EntityAvatar entity : getPlayer().getTeamManager().getActiveTeam()) {
-					getPlayer().getServer().getInventoryManager().upgradeAvatar(player, entity.getAvatar(), count);
-				}
+				getPlayer().getServer().getInventoryManager().upgradeAvatar(player, getPlayer().getTeamManager().getCurrentAvatarEntity().getAvatar(), count);
 				break;
 			case 102: // Adventure exp
 				getPlayer().addExpDirectly(count);
 				break;
+			case 105: // Companionship exp
+				getPlayer().getServer().getInventoryManager().upgradeAvatarFetterLevel(player, getPlayer().getTeamManager().getCurrentAvatarEntity().getAvatar(), count);
+				break;
 			case 201: // Primogem
 				getPlayer().setPrimogems(player.getPrimogems() + count);
 				break;
 			case 202: // Mora
 				getPlayer().setMora(player.getMora() + count);
 				break;
+			case 203: // Genesis Crystals
+				getPlayer().setCrystals(player.getCrystals() + count);
+				break;
 		}
 	}
 	
--- a/src/main/java/emu/grasscutter/game/managers/InventoryManager.java
+++ b/src/main/java/emu/grasscutter/game/managers/InventoryManager.java
@ -23,23 +23,7 @@ import emu.grasscutter.game.player.Player;
 import emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam;
 import emu.grasscutter.net.proto.MaterialInfoOuterClass.MaterialInfo;
 import emu.grasscutter.server.game.GameServer;
-import emu.grasscutter.server.packet.send.PacketAbilityChangeNotify;
-import emu.grasscutter.server.packet.send.PacketAvatarPromoteRsp;
-import emu.grasscutter.server.packet.send.PacketAvatarPropNotify;
-import emu.grasscutter.server.packet.send.PacketAvatarSkillChangeNotify;
-import emu.grasscutter.server.packet.send.PacketAvatarSkillUpgradeRsp;
-import emu.grasscutter.server.packet.send.PacketAvatarUnlockTalentNotify;
-import emu.grasscutter.server.packet.send.PacketAvatarUpgradeRsp;
-import emu.grasscutter.server.packet.send.PacketDestroyMaterialRsp;
-import emu.grasscutter.server.packet.send.PacketProudSkillChangeNotify;
-import emu.grasscutter.server.packet.send.PacketProudSkillExtraLevelNotify;
-import emu.grasscutter.server.packet.send.PacketReliquaryUpgradeRsp;
-import emu.grasscutter.server.packet.send.PacketSetEquipLockStateRsp;
-import emu.grasscutter.server.packet.send.PacketStoreItemChangeNotify;
-import emu.grasscutter.server.packet.send.PacketUnlockAvatarTalentRsp;
-import emu.grasscutter.server.packet.send.PacketWeaponAwakenRsp;
-import emu.grasscutter.server.packet.send.PacketWeaponPromoteRsp;
-import emu.grasscutter.server.packet.send.PacketWeaponUpgradeRsp;
+import emu.grasscutter.server.packet.send.*;
 import emu.grasscutter.utils.Utils;
 import it.unimi.dsi.fastutil.ints.Int2IntMap;
 import it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap;
@ -734,6 +718,7 @@ public class InventoryManager {
 		avatar.save();
 		
 		player.sendPacket(new PacketAvatarPropNotify(avatar));
+		player.sendPacket(new PacketAvatarFetterDataNotify(avatar));
 	}

 	public void upgradeAvatarSkill(Player player, long guid, int skillId) {
@ -923,6 +908,7 @@ public class InventoryManager {
 				break;
 		}

+		// Welkin
 		if (useItem.getItemId() == 1202) {
 			player.rechargeMoonCard();
 			used = 1;
--- a/src/main/java/emu/grasscutter/game/player/Player.java
+++ b/src/main/java/emu/grasscutter/game/player/Player.java
@ -1,20 +1,16 @@
 package emu.grasscutter.game.player;

-import java.time.Instant;
-import java.util.*;
-
 import dev.morphia.annotations.*;
 import emu.grasscutter.GameConstants;
 import emu.grasscutter.Grasscutter;
-import emu.grasscutter.command.CommandHandler;
 import emu.grasscutter.data.GameData;
 import emu.grasscutter.data.def.PlayerLevelData;
 import emu.grasscutter.database.DatabaseHelper;
-import emu.grasscutter.game.avatar.AvatarProfileData;
-import emu.grasscutter.game.avatar.AvatarStorage;
 import emu.grasscutter.game.Account;
 import emu.grasscutter.game.CoopRequest;
 import emu.grasscutter.game.avatar.Avatar;
+import emu.grasscutter.game.avatar.AvatarProfileData;
+import emu.grasscutter.game.avatar.AvatarStorage;
 import emu.grasscutter.game.entity.EntityItem;
 import emu.grasscutter.game.entity.GameEntity;
 import emu.grasscutter.game.friends.FriendsList;
@ -25,28 +21,30 @@ import emu.grasscutter.game.inventory.Inventory;
 import emu.grasscutter.game.mail.Mail;
 import emu.grasscutter.game.props.ActionReason;
 import emu.grasscutter.game.props.PlayerProperty;
+import emu.grasscutter.game.shop.ShopLimit;
 import emu.grasscutter.game.world.Scene;
 import emu.grasscutter.game.world.World;
 import emu.grasscutter.net.packet.BasePacket;
 import emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntry;
 import emu.grasscutter.net.proto.CombatInvokeEntryOuterClass.CombatInvokeEntry;
-import emu.grasscutter.net.proto.HeadImageOuterClass.HeadImage;
 import emu.grasscutter.net.proto.InteractTypeOuterClass.InteractType;
 import emu.grasscutter.net.proto.MpSettingTypeOuterClass.MpSettingType;
 import emu.grasscutter.net.proto.OnlinePlayerInfoOuterClass.OnlinePlayerInfo;
-import emu.grasscutter.net.proto.PlayerApplyEnterMpReasonOuterClass.PlayerApplyEnterMpReason;
 import emu.grasscutter.net.proto.PlayerApplyEnterMpResultNotifyOuterClass;
 import emu.grasscutter.net.proto.PlayerLocationInfoOuterClass.PlayerLocationInfo;
 import emu.grasscutter.net.proto.PlayerWorldLocationInfoOuterClass;
+import emu.grasscutter.net.proto.ProfilePictureOuterClass.ProfilePicture;
 import emu.grasscutter.net.proto.SocialDetailOuterClass.SocialDetail;
+import emu.grasscutter.net.proto.SocialShowAvatarInfoOuterClass;
 import emu.grasscutter.server.game.GameServer;
 import emu.grasscutter.server.game.GameSession;
 import emu.grasscutter.server.packet.send.*;
-import emu.grasscutter.utils.Position;
 import emu.grasscutter.utils.DateHelper;
+import emu.grasscutter.utils.Position;
 import it.unimi.dsi.fastutil.ints.Int2ObjectMap;
 import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap;

+import java.time.Instant;
 import java.util.*;

@Entity(value = "players", useDiscriminator = false)
@ -84,6 +82,7 @@ public class Player {
 	private ArrayList<AvatarProfileData> shownAvatars;
 	private Set<Integer> rewardedLevels;
 	private ArrayList<Mail> mail;
+	private ArrayList<ShopLimit> shopLimit;

 	private int sceneId;
 	private int regionId;
@ -95,6 +94,9 @@ public class Player {
 	private int moonCardDuration;
 	private Set<Date> moonCardGetTimes;

+	private List<Integer> showAvatarList;
+	private boolean showAvatars;
+
 	@Transient private boolean paused;
 	@Transient private int enterSceneToken;
 	@Transient private SceneLoadState sceneState;
@ -141,6 +143,8 @@ public class Player {
 		this.birthday = new PlayerBirthday();
 		this.rewardedLevels = new HashSet<>();
 		this.moonCardGetTimes = new HashSet<>();
+
+		this.shopLimit = new ArrayList<>();
 	}

 	// On player creation
@ -295,6 +299,15 @@ public class Player {
 		this.sendPacket(new PacketPlayerPropNotify(this, PlayerProperty.PROP_PLAYER_SCOIN));
 	}
 	
+	public int getCrystals() {
+		return this.getProperty(PlayerProperty.PROP_PLAYER_MCOIN);
+	}
+
+	public void setCrystals(int crystals) {
+		this.setProperty(PlayerProperty.PROP_PLAYER_MCOIN, crystals);
+		this.sendPacket(new PacketPlayerPropNotify(this, PlayerProperty.PROP_PLAYER_MCOIN));
+	}
+
 	private int getExpRequired(int level) {
 		PlayerLevelData levelData = GameData.getPlayerLevelDataMap().get(level);
 		return levelData != null ? levelData.getExp() : 0;
@ -504,6 +517,22 @@ public class Player {
 		this.regionId = regionId;
 	}

+	public void setShowAvatars(boolean showAvatars) {
+		this.showAvatars = showAvatars;
+	}
+
+	public boolean isShowAvatars() {
+		return showAvatars;
+	}
+
+	public void setShowAvatarList(List<Integer> showAvatarList) {
+		this.showAvatarList = showAvatarList;
+	}
+
+	public List<Integer> getShowAvatarList() {
+		return showAvatarList;
+	}
+
 	public boolean inMoonCard() {
 		return moonCard;
 	}
@ -550,11 +579,7 @@ public class Player {
 	}

 	public void rechargeMoonCard() {
-		LinkedList<GameItem> items = new LinkedList<GameItem>();
-		for (int i = 0; i < 300; i++) {
-			items.add(new GameItem(203));
-		} 
-		inventory.addItems(items);
+		inventory.addItem(new GameItem(203, 300));
 		if (!moonCard) {
 			moonCard = true;
 			Date now = new Date();
@ -592,6 +617,35 @@ public class Player {
 		session.send(new PacketCardProductRewardNotify(getMoonCardRemainDays()));
 	}

+	public List<ShopLimit> getShopLimit() {
+		return shopLimit;
+	}
+
+	public int getGoodsLimitNum(int goodsId) {
+		for (ShopLimit sl : getShopLimit()) {
+			if (sl.getShopGoodId() == goodsId)
+				return sl.getHasBought();
+		}
+		return 0;
+	}
+
+	public void addShopLimit(int goodsId, int boughtCount) {
+		boolean found = false;
+		for (ShopLimit sl : getShopLimit()) {
+			if (sl.getShopGoodId() == goodsId){
+				sl.setHasBought(sl.getHasBought() + boughtCount);
+				found = true;
+			}
+		}
+		if (!found) {
+			ShopLimit sl = new ShopLimit();
+			sl.setShopGoodId(goodsId);
+			sl.setHasBought(boughtCount);
+			shopLimit.add(sl);
+		}
+		this.save();
+	}
+
 	public boolean inGodmode() {
 		return godmode;
 	}
@ -714,19 +768,30 @@ public class Player {
 			return;
 		}

-		// Delete
-		entity.getScene().removeEntity(entity);
-
 		// Handle
 		if (entity instanceof EntityItem) {
 			// Pick item
 			EntityItem drop = (EntityItem) entity;
+			if (!drop.isShare()) // check drop owner to avoid someone picked up item in others' world
+			{
+				int dropOwner = (int)(drop.getGuid() >> 32);
+				if (dropOwner != getUid())
+					return;
+			}
+			entity.getScene().removeEntity(entity);
 			GameItem item = new GameItem(drop.getItemData(), drop.getCount());
 			// Add to inventory
 			boolean success = getInventory().addItem(item, ActionReason.SubfieldDrop);
 			if (success) {
-				this.sendPacket(new PacketGadgetInteractRsp(drop, InteractType.INTERACT_PICK_ITEM));
+
+				if (!drop.isShare()) // not shared drop
+					this.sendPacket(new PacketGadgetInteractRsp(drop, InteractType.INTERACT_PICK_ITEM));
+				else
+					this.getScene().broadcastPacket(new PacketGadgetInteractRsp(drop, InteractType.INTERACT_PICK_ITEM));
 			}
+		} else {
+			// Delete directly
+			entity.getScene().removeEntity(entity);
 		}

 		return;
@ -754,7 +819,7 @@ public class Player {
 				.setMpSettingType(this.getMpSetting())
 				.setNameCardId(this.getNameCardId())
 				.setSignature(this.getSignature())
-				.setAvatarId(HeadImage.newBuilder().setAvatarId(this.getHeadImage()).getAvatarId());
+				.setProfilePicture(ProfilePicture.newBuilder().setAvatarId(this.getHeadImage()));

 		if (this.getWorld() != null) {
 			onlineInfo.setCurPlayerNumInWorld(this.getWorld().getPlayers().indexOf(this) + 1);
@ -787,15 +852,49 @@ public class Player {
 	}

 	public SocialDetail.Builder getSocialDetail() {
+		List<SocialShowAvatarInfoOuterClass.SocialShowAvatarInfo> socialShowAvatarInfoList = new ArrayList<>();
+		if (this.isOnline()) {
+			if (this.getShowAvatarList() != null) {
+				for (int avatarId : this.getShowAvatarList()) {
+					socialShowAvatarInfoList.add(
+							socialShowAvatarInfoList.size(),
+							SocialShowAvatarInfoOuterClass.SocialShowAvatarInfo.newBuilder()
+									.setAvatarId(avatarId)
+									.setLevel(getAvatars().getAvatarById(avatarId).getLevel())
+									.setCostumeId(getAvatars().getAvatarById(avatarId).getCostume())
+									.build()
+					);
+				}
+			}
+		} else {
+			List<Integer> showAvatarList = DatabaseHelper.getPlayerById(id).getShowAvatarList();
+			AvatarStorage avatars = DatabaseHelper.getPlayerById(id).getAvatars();
+			avatars.loadFromDatabase();
+			if (showAvatarList != null) {
+				for (int avatarId : showAvatarList) {
+					socialShowAvatarInfoList.add(
+							socialShowAvatarInfoList.size(),
+							SocialShowAvatarInfoOuterClass.SocialShowAvatarInfo.newBuilder()
+									.setAvatarId(avatarId)
+									.setLevel(avatars.getAvatarById(avatarId).getLevel())
+									.setCostumeId(avatars.getAvatarById(avatarId).getCostume())
+									.build()
+					);
+				}
+			}
+		}
+
 		SocialDetail.Builder social = SocialDetail.newBuilder()
 				.setUid(this.getUid())
-				.setAvatarId(HeadImage.newBuilder().setAvatarId(this.getHeadImage()).getAvatarId())
+				.setProfilePicture(ProfilePicture.newBuilder().setAvatarId(this.getHeadImage()))
 				.setNickname(this.getNickname())
 				.setSignature(this.getSignature())
 				.setLevel(this.getLevel())
 				.setBirthday(this.getBirthday().getFilledProtoWhenNotEmpty())
 				.setWorldLevel(this.getWorldLevel())
 				.setNameCardId(this.getNameCardId())
+				.setIsShowAvatar(this.isShowAvatars())
+				.addAllShowAvatarInfoList(socialShowAvatarInfoList)
 				.setFinishAchievementNum(0);
 		return social;
 	}
@ -901,6 +1000,8 @@ public class Player {
 		session.send(new PacketPlayerStoreNotify(this));
 		session.send(new PacketAvatarDataNotify(this));

+		getTodayMoonCard(); // The timer works at 0:0, some users log in after that, use this method to check if they have received a reward today or not. If not, send the reward.
+
 		session.send(new PacketPlayerEnterSceneNotify(this)); // Enter game world
 		session.send(new PacketPlayerLevelRewardUpdateNotify(rewardedLevels));
 		session.send(new PacketOpenStateUpdateNotify());
--- a/src/main/java/emu/grasscutter/game/shop/ShopInfo.java
+++ b/src/main/java/emu/grasscutter/game/shop/ShopInfo.java
@ -1,5 +1,153 @@
 package emu.grasscutter.game.shop;

-public class ShopInfo {
+import emu.grasscutter.data.common.ItemParamData;

+import java.util.ArrayList;
+import java.util.List;
+
+public class ShopInfo {
+    private int goodsId = 0;
+    private ItemParamData goodsItem;
+    private int scoin = 0;
+    private List<ItemParamData> costItemList;
+    private int boughtNum = 0;
+    private int buyLimit = 0;
+    private int beginTime = 0;
+    private int endTime = 1924992000;
+    private int nextRefreshTime = 1924992000;
+    private int minLevel = 0;
+    private int maxLevel = 61;
+    private List<Integer> preGoodsIdList = new ArrayList<>();
+    private int mcoin = 0;
+    private int hcoin = 0;
+    private int disableType = 0;
+    private int secondarySheetId = 0;
+
+    public int getHcoin() {
+        return hcoin;
+    }
+
+    public void setHcoin(int hcoin) {
+        this.hcoin = hcoin;
+    }
+
+    public List<Integer> getPreGoodsIdList() {
+        return preGoodsIdList;
+    }
+
+    public void setPreGoodsIdList(List<Integer> preGoodsIdList) {
+        this.preGoodsIdList = preGoodsIdList;
+    }
+
+    public int getMcoin() {
+        return mcoin;
+    }
+
+    public void setMcoin(int mcoin) {
+        this.mcoin = mcoin;
+    }
+
+    public int getDisableType() {
+        return disableType;
+    }
+
+    public void setDisableType(int disableType) {
+        this.disableType = disableType;
+    }
+
+    public int getSecondarySheetId() {
+        return secondarySheetId;
+    }
+
+    public void setSecondarySheetId(int secondarySheetId) {
+        this.secondarySheetId = secondarySheetId;
+    }
+
+    public int getGoodsId() {
+        return goodsId;
+    }
+
+    public void setGoodsId(int goodsId) {
+        this.goodsId = goodsId;
+    }
+
+    public ItemParamData getGoodsItem() {
+        return goodsItem;
+    }
+
+    public void setGoodsItem(ItemParamData goodsItem) {
+        this.goodsItem = goodsItem;
+    }
+
+    public int getScoin() {
+        return scoin;
+    }
+
+    public void setScoin(int scoin) {
+        this.scoin = scoin;
+    }
+
+    public List<ItemParamData> getCostItemList() {
+        return costItemList;
+    }
+
+    public void setCostItemList(List<ItemParamData> costItemList) {
+        this.costItemList = costItemList;
+    }
+
+    public int getBoughtNum() {
+        return boughtNum;
+    }
+
+    public void setBoughtNum(int boughtNum) {
+        this.boughtNum = boughtNum;
+    }
+
+    public int getBuyLimit() {
+        return buyLimit;
+    }
+
+    public void setBuyLimit(int buyLimit) {
+        this.buyLimit = buyLimit;
+    }
+
+    public int getBeginTime() {
+        return beginTime;
+    }
+
+    public void setBeginTime(int beginTime) {
+        this.beginTime = beginTime;
+    }
+
+    public int getEndTime() {
+        return endTime;
+    }
+
+    public void setEndTime(int endTime) {
+        this.endTime = endTime;
+    }
+
+    public int getNextRefreshTime() {
+        return nextRefreshTime;
+    }
+
+    public void setNextRefreshTime(int nextRefreshTime) {
+        this.nextRefreshTime = nextRefreshTime;
+    }
+
+    public int getMinLevel() {
+        return minLevel;
+    }
+
+    public void setMinLevel(int minLevel) {
+        this.minLevel = minLevel;
+    }
+
+    public int getMaxLevel() {
+        return maxLevel;
+    }
+
+    public void setMaxLevel(int maxLevel) {
+        this.maxLevel = maxLevel;
+    }
 }
--- a/src/main/java/emu/grasscutter/game/shop/ShopLimit.java
+++ b/src/main/java/emu/grasscutter/game/shop/ShopLimit.java
@ -0,0 +1,25 @@
+package emu.grasscutter.game.shop;
+
+import dev.morphia.annotations.Entity;
+
+@Entity
+public class ShopLimit {
+    public int getShopGoodId() {
+        return shopGoodId;
+    }
+
+    public void setShopGoodId(int shopGoodId) {
+        this.shopGoodId = shopGoodId;
+    }
+
+    public int getHasBought() {
+        return hasBought;
+    }
+
+    public void setHasBought(int hasBought) {
+        this.hasBought = hasBought;
+    }
+
+    private int shopGoodId;
+    private int hasBought;
+}
--- a/src/main/java/emu/grasscutter/game/shop/ShopManager.java
+++ b/src/main/java/emu/grasscutter/game/shop/ShopManager.java
@ -1,12 +1,46 @@
 package emu.grasscutter.game.shop;

+import com.google.gson.reflect.TypeToken;
+import emu.grasscutter.Grasscutter;
 import emu.grasscutter.server.game.GameServer;
+import it.unimi.dsi.fastutil.ints.Int2ObjectMap;
+import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap;
+
+import java.io.FileReader;
+import java.util.Collection;
+import java.util.List;

 public class ShopManager {
 	private final GameServer server;

+	public Int2ObjectMap<List<ShopInfo>> getShopData() {
+		return shopData;
+	}
+
+	private final Int2ObjectMap<List<ShopInfo>> shopData;
+
 	public ShopManager(GameServer server) {
 		this.server = server;
+		this.shopData = new Int2ObjectOpenHashMap<>();
+		this.load();
+	}
+
+	public synchronized void load() {
+		try (FileReader fileReader = new FileReader(Grasscutter.getConfig().DATA_FOLDER + "Shop.json")) {
+			getShopData().clear();
+			List<ShopTable> banners = Grasscutter.getGsonFactory().fromJson(fileReader, TypeToken.getParameterized(Collection.class, ShopTable.class).getType());
+			if(banners.size() > 0) {
+				for (ShopTable shopTable : banners) {
+					getShopData().put(shopTable.getShopId(), shopTable.getItems());
+				}
+				Grasscutter.getLogger().info("Shop data successfully loaded.");
+			} else {
+				Grasscutter.getLogger().error("Unable to load shop data. Shop data size is 0.");
+			}
+		} catch (Exception e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		}
 	}

 	public GameServer getServer() {
--- a/src/main/java/emu/grasscutter/game/shop/ShopTable.java
+++ b/src/main/java/emu/grasscutter/game/shop/ShopTable.java
@ -0,0 +1,25 @@
+package emu.grasscutter.game.shop;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class ShopTable {
+    private int shopId;
+    private List<ShopInfo> items = new ArrayList<>();
+
+    public int getShopId() {
+        return shopId;
+    }
+
+    public void setShopId(int shopId) {
+        this.shopId = shopId;
+    }
+
+    public List<ShopInfo> getItems() {
+        return items;
+    }
+
+    public void setItems(List<ShopInfo> items) {
+        this.items = items;
+    }
+}
--- a/src/main/java/emu/grasscutter/game/world/Scene.java
+++ b/src/main/java/emu/grasscutter/game/world/Scene.java
@ -1,28 +1,12 @@
 package emu.grasscutter.game.world;

-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Set;
-
-import org.danilopianini.util.SpatialIndex;
-
 import emu.grasscutter.Grasscutter;
 import emu.grasscutter.data.GameData;
 import emu.grasscutter.data.GameDepot;
-import emu.grasscutter.data.GameResource;
 import emu.grasscutter.data.def.MonsterData;
 import emu.grasscutter.data.def.SceneData;
 import emu.grasscutter.data.def.WorldLevelData;
-import emu.grasscutter.game.entity.EntityAvatar;
-import emu.grasscutter.game.entity.EntityClientGadget;
-import emu.grasscutter.game.entity.EntityGadget;
-import emu.grasscutter.game.entity.EntityMonster;
-import emu.grasscutter.game.entity.GameEntity;
+import emu.grasscutter.game.entity.*;
 import emu.grasscutter.game.player.Player;
 import emu.grasscutter.game.player.TeamInfo;
 import emu.grasscutter.game.props.ClimateType;
@ -37,10 +21,12 @@ import emu.grasscutter.server.packet.send.PacketEntityFightPropUpdateNotify;
 import emu.grasscutter.server.packet.send.PacketLifeStateChangeNotify;
 import emu.grasscutter.server.packet.send.PacketSceneEntityAppearNotify;
 import emu.grasscutter.server.packet.send.PacketSceneEntityDisappearNotify;
-import emu.grasscutter.utils.Utils;
 import it.unimi.dsi.fastutil.ints.Int2ObjectMap;
 import it.unimi.dsi.fastutil.ints.Int2ObjectMaps;
 import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap;
+import org.danilopianini.util.SpatialIndex;
+
+import java.util.*;

 public class Scene {
 	private final World world;
@ -229,6 +215,11 @@ public class Scene {
 		this.broadcastPacket(new PacketSceneEntityAppearNotify(entity));
 	}

+	public synchronized void addEntityToSingleClient(Player player, GameEntity entity) {
+		this.addEntityDirectly(entity);
+		player.sendPacket(new PacketSceneEntityAppearNotify(entity));
+	}
+	
 	public synchronized void addEntities(Collection<GameEntity> entities) {
 		for (GameEntity entity : entities) {
 			this.addEntityDirectly(entity);
@ -310,6 +301,12 @@ public class Scene {
 	public void killEntity(GameEntity target, int attackerId) {
 		// Packet
 		this.broadcastPacket(new PacketLifeStateChangeNotify(attackerId, target, LifeState.LIFE_DEAD));
+
+		// Reward drop
+		if (target instanceof EntityMonster) {
+			Grasscutter.getGameServer().getDropManager().callDrop((EntityMonster) target);
+		}
+
 		this.removeEntity(target);
 		
 		// Death event
--- a/src/main/java/emu/grasscutter/net/packet/PacketOpcodes.java
+++ b/src/main/java/emu/grasscutter/net/packet/PacketOpcodes.java
@ -1171,6 +1171,11 @@ public class PacketOpcodes {
    public static final int UseWidgetCreateGadgetRsp = 4290;
    public static final int UseWidgetRetractGadgetReq = 4255;
    public static final int UseWidgetRetractGadgetRsp = 4297;
+    public static final int VehicleSpawnReq = 809;
+    public static final int VehicleSpawnRsp = 865;
+    public static final int VehicleInteractReq = 862;
+    public static final int VehicleInteractRsp = 889;
+    public static final int VehicleStaminaNotify = 866;
    public static final int ViewCodexReq = 4210;
    public static final int ViewCodexRsp = 4209;
    public static final int WatcherAllDataNotify = 2260;
--- a/src/main/java/emu/grasscutter/server/dispatch/DispatchServer.java
+++ b/src/main/java/emu/grasscutter/server/dispatch/DispatchServer.java
@ -339,6 +339,10 @@ public final class DispatchServer {
 					// added.
 					account = DatabaseHelper.createAccountWithId(requestData.account, 0);

+					for (String permission : Grasscutter.getConfig().getDispatchOptions().defaultPermissions) {
+						account.addPermission(permission);
+					}
+
 					if (account != null) {
 						responseData.message = "OK";
 						responseData.data.account.uid = account.getId();
--- a/src/main/java/emu/grasscutter/server/game/GameServer.java
+++ b/src/main/java/emu/grasscutter/server/game/GameServer.java
@ -1,15 +1,11 @@
 package emu.grasscutter.server.game;

-import java.net.InetSocketAddress;
-import java.time.OffsetDateTime;
-import java.util.*;
-import java.util.concurrent.ConcurrentHashMap;
-
 import emu.grasscutter.GameConstants;
 import emu.grasscutter.Grasscutter;
 import emu.grasscutter.command.CommandMap;
 import emu.grasscutter.database.DatabaseHelper;
 import emu.grasscutter.game.Account;
+import emu.grasscutter.game.drop.DropManager;
 import emu.grasscutter.game.dungeons.DungeonManager;
 import emu.grasscutter.game.gacha.GachaManager;
 import emu.grasscutter.game.managers.ChatManager;
@ -27,6 +23,11 @@ import emu.grasscutter.server.event.internal.ServerStartEvent;
 import emu.grasscutter.server.event.internal.ServerStopEvent;
 import emu.grasscutter.task.TaskMap;

+import java.net.InetSocketAddress;
+import java.time.OffsetDateTime;
+import java.util.*;
+import java.util.concurrent.ConcurrentHashMap;
+
 public final class GameServer extends KcpServer {
 	private final InetSocketAddress address;
 	private final GameServerPacketHandler packetHandler;
@ -42,6 +43,7 @@ public final class GameServer extends KcpServer {
 	private final DungeonManager dungeonManager;
 	private final CommandMap commandMap;
 	private final TaskMap taskMap;
+	private final DropManager dropManager;
 	
 	public GameServer(InetSocketAddress address) {
 		super(address);
@ -60,6 +62,7 @@ public final class GameServer extends KcpServer {
 		this.dungeonManager = new DungeonManager(this);
 		this.commandMap = new CommandMap(true);
 		this.taskMap = new TaskMap(true);
+		this.dropManager = new DropManager(this);
 		
 		// Schedule game loop.
 		Timer gameLoop = new Timer();
@ -110,6 +113,10 @@ public final class GameServer extends KcpServer {
 		return multiplayerManager;
 	}

+	public DropManager getDropManager() {
+		return dropManager;
+	}
+	
 	public DungeonManager getDungeonManager() {
 		return dungeonManager;
 	}
@ -182,7 +189,11 @@ public final class GameServer extends KcpServer {
 			world.onTick();
 		}
 		
-    ServerTickEvent event = new ServerTickEvent(); event.call();
+		for (Player player : this.getPlayers().values()) {
+			player.onTick();
+		}
+  
+		ServerTickEvent event = new ServerTickEvent(); event.call();
 	}
 	
 	public void registerWorld(World world) {
@ -196,6 +207,7 @@ public final class GameServer extends KcpServer {

 	@Override
 	public void onStartFinish() {
+		Grasscutter.getLogger().info("Grasscutter is FREE software. If you have paid for this, you may have been scammed. Homepage: https://github.com/Grasscutters/Grasscutter");
 		Grasscutter.getLogger().info("Game Server started on port " + address.getPort());
 		ServerStartEvent event = new ServerStartEvent(ServerEvent.Type.GAME, OffsetDateTime.now()); event.call();
 	}
--- a/src/main/java/emu/grasscutter/server/packet/recv/HandlerBuyGoodsReq.java
+++ b/src/main/java/emu/grasscutter/server/packet/recv/HandlerBuyGoodsReq.java
@ -0,0 +1,67 @@
+package emu.grasscutter.server.packet.recv;
+
+import emu.grasscutter.data.GameData;
+import emu.grasscutter.game.inventory.GameItem;
+import emu.grasscutter.game.props.ActionReason;
+import emu.grasscutter.game.props.PlayerProperty;
+import emu.grasscutter.net.packet.Opcodes;
+import emu.grasscutter.net.packet.PacketHandler;
+import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.proto.BuyGoodsReqOuterClass;
+import emu.grasscutter.net.proto.ItemParamOuterClass;
+import emu.grasscutter.net.proto.ShopGoodsOuterClass;
+import emu.grasscutter.server.game.GameSession;
+import emu.grasscutter.server.packet.send.PacketBuyGoodsRsp;
+import emu.grasscutter.server.packet.send.PacketStoreItemChangeNotify;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Optional;
+
+@Opcodes(PacketOpcodes.BuyGoodsReq)
+public class HandlerBuyGoodsReq extends PacketHandler {
+
+    @Override
+    public void handle(GameSession session, byte[] header, byte[] payload) throws Exception {
+        BuyGoodsReqOuterClass.BuyGoodsReq buyGoodsReq = BuyGoodsReqOuterClass.BuyGoodsReq.parseFrom(payload);
+
+        for (ShopGoodsOuterClass.ShopGoods sg : buyGoodsReq.getGoodsListList()) {
+            if (sg.getScoin() > 0 && session.getPlayer().getMora() < buyGoodsReq.getBoughtNum() * sg.getScoin()) {
+                return;
+            }
+            if (sg.getHcoin() > 0 && session.getPlayer().getPrimogems() < buyGoodsReq.getBoughtNum() * sg.getHcoin()) {
+                return;
+            }
+            if (sg.getMcoin() > 0 && session.getPlayer().getCrystals() < buyGoodsReq.getBoughtNum() * sg.getMcoin()) {
+                return;
+            }
+
+            HashMap<GameItem, Integer> itemsCache = new HashMap<>();
+            for (ItemParamOuterClass.ItemParam p : sg.getCostItemListList()) {
+                Optional<GameItem> invItem = session.getPlayer().getInventory().getItems().values().stream().filter(x -> x.getItemId() == p.getItemId()).findFirst();
+                if (invItem.isEmpty() || invItem.get().getCount() < p.getCount())
+                    return;
+                itemsCache.put(invItem.get(), p.getCount() * buyGoodsReq.getBoughtNum());
+            }
+
+            session.getPlayer().setMora(session.getPlayer().getMora() - buyGoodsReq.getBoughtNum() * sg.getScoin());
+            session.getPlayer().setPrimogems(session.getPlayer().getPrimogems() - buyGoodsReq.getBoughtNum() * sg.getHcoin());
+            session.getPlayer().setCrystals(session.getPlayer().getCrystals() - buyGoodsReq.getBoughtNum() * sg.getMcoin());
+
+            if (!itemsCache.isEmpty()) {
+                for (GameItem gi : itemsCache.keySet()) {
+                    session.getPlayer().getInventory().removeItem(gi, itemsCache.get(gi));
+                }
+                itemsCache.clear();
+            }
+
+            session.getPlayer().addShopLimit(sg.getGoodsId(), buyGoodsReq.getBoughtNum());
+            GameItem item = new GameItem(GameData.getItemDataMap().get(sg.getGoodsItem().getItemId()));
+            item.setCount(buyGoodsReq.getBoughtNum() * sg.getGoodsItem().getCount());
+            session.getPlayer().getInventory().addItem(item, ActionReason.Shop, true); // fix: not notify when got virtual item from shop
+            session.send(new PacketBuyGoodsRsp(buyGoodsReq.getShopType(), session.getPlayer().getGoodsLimitNum(sg.getGoodsId()), sg));
+        }
+
+        session.getPlayer().save();
+    }
+}
--- a/src/main/java/emu/grasscutter/server/packet/recv/HandlerGetShopReq.java
+++ b/src/main/java/emu/grasscutter/server/packet/recv/HandlerGetShopReq.java
@ -1,9 +1,9 @@
 package emu.grasscutter.server.packet.recv;

 import emu.grasscutter.net.packet.Opcodes;
+import emu.grasscutter.net.packet.PacketHandler;
 import emu.grasscutter.net.packet.PacketOpcodes;
 import emu.grasscutter.net.proto.GetShopReqOuterClass.GetShopReq;
-import emu.grasscutter.net.packet.PacketHandler;
 import emu.grasscutter.server.game.GameSession;
 import emu.grasscutter.server.packet.send.PacketGetShopRsp;

@ -13,7 +13,6 @@ public class HandlerGetShopReq extends PacketHandler {
 	public void handle(GameSession session, byte[] header, byte[] payload) throws Exception {
 		GetShopReq req = GetShopReq.parseFrom(payload);

-		// TODO
-		session.send(new PacketGetShopRsp(req.getShopType()));
+		session.send(new PacketGetShopRsp(session.getPlayer(), req.getShopType()));
 	}
 }
--- a/src/main/java/emu/grasscutter/server/packet/recv/HandlerUpdatePlayerShowAvatarListReq.java
+++ b/src/main/java/emu/grasscutter/server/packet/recv/HandlerUpdatePlayerShowAvatarListReq.java
@ -0,0 +1,22 @@
+package emu.grasscutter.server.packet.recv;
+
+import emu.grasscutter.Grasscutter;
+import emu.grasscutter.net.packet.Opcodes;
+import emu.grasscutter.net.packet.PacketHandler;
+import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.proto.UpdatePlayerShowAvatarListReqOuterClass;
+import emu.grasscutter.server.game.GameSession;
+import emu.grasscutter.server.packet.send.PacketUpdatePlayerShowAvatarListRsp;
+
+@Opcodes(PacketOpcodes.UpdatePlayerShowAvatarListReq)
+public class HandlerUpdatePlayerShowAvatarListReq extends PacketHandler {
+    @Override
+    public void handle(GameSession session, byte[] header, byte[] payload) throws Exception {
+        UpdatePlayerShowAvatarListReqOuterClass.UpdatePlayerShowAvatarListReq req = UpdatePlayerShowAvatarListReqOuterClass.UpdatePlayerShowAvatarListReq.parseFrom(payload);
+
+        session.getPlayer().setShowAvatars(req.getIsShowAvatar());
+        session.getPlayer().setShowAvatarList(req.getShowAvatarIdListList());
+
+        session.send(new PacketUpdatePlayerShowAvatarListRsp(req.getIsShowAvatar(), req.getShowAvatarIdListList()));
+    }
+}
--- a/src/main/java/emu/grasscutter/server/packet/recv/HandlerVehicleInteractReq.java
+++ b/src/main/java/emu/grasscutter/server/packet/recv/HandlerVehicleInteractReq.java
@ -0,0 +1,19 @@
+package emu.grasscutter.server.packet.recv;
+
+import emu.grasscutter.net.packet.Opcodes;
+import emu.grasscutter.net.packet.PacketHandler;
+import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.proto.VehicleInteractReqOuterClass;
+
+import emu.grasscutter.server.game.GameSession;
+import emu.grasscutter.server.packet.send.PacketVehicleInteractRsp;
+
+@Opcodes(PacketOpcodes.VehicleInteractReq)
+public class HandlerVehicleInteractReq extends PacketHandler {
+
+	@Override
+	public void handle(GameSession session, byte[] header, byte[] payload) throws Exception {
+		VehicleInteractReqOuterClass.VehicleInteractReq req = VehicleInteractReqOuterClass.VehicleInteractReq.parseFrom(payload);
+		session.send(new PacketVehicleInteractRsp(session.getPlayer(), req.getEntityId(), req.getInteractType()));
+	}
+}
--- a/src/main/java/emu/grasscutter/server/packet/recv/HandlerVehicleSpawnReq.java
+++ b/src/main/java/emu/grasscutter/server/packet/recv/HandlerVehicleSpawnReq.java
@ -0,0 +1,21 @@
+package emu.grasscutter.server.packet.recv;
+
+import emu.grasscutter.net.packet.Opcodes;
+import emu.grasscutter.net.packet.PacketHandler;
+import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.proto.VehicleSpawnReqOuterClass;
+
+import emu.grasscutter.server.game.GameSession;
+import emu.grasscutter.server.packet.send.PacketVehicleSpawnRsp;
+
+import emu.grasscutter.utils.Position;
+
+@Opcodes(PacketOpcodes.VehicleSpawnReq)
+public class HandlerVehicleSpawnReq extends PacketHandler {
+
+	@Override
+	public void handle(GameSession session, byte[] header, byte[] payload) throws Exception {
+		VehicleSpawnReqOuterClass.VehicleSpawnReq req = VehicleSpawnReqOuterClass.VehicleSpawnReq.parseFrom(payload);
+		session.send(new PacketVehicleSpawnRsp(session.getPlayer(), req.getVehicleId(), req.getPointId(), new Position(req.getPos()), new Position(req.getRot())));
+	}
+}
--- a/src/main/java/emu/grasscutter/server/packet/send/PacketBuyGoodsRsp.java
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketBuyGoodsRsp.java
@ -0,0 +1,22 @@
+package emu.grasscutter.server.packet.send;
+
+import emu.grasscutter.net.packet.BasePacket;
+import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.proto.BuyGoodsRspOuterClass;
+import emu.grasscutter.net.proto.ShopGoodsOuterClass;
+
+public class PacketBuyGoodsRsp extends BasePacket {
+    public PacketBuyGoodsRsp(int shopType, int boughtNum, ShopGoodsOuterClass.ShopGoods sg) {
+        super(PacketOpcodes.BuyGoodsRsp);
+
+        BuyGoodsRspOuterClass.BuyGoodsRsp buyGoodsRsp = BuyGoodsRspOuterClass.BuyGoodsRsp.newBuilder()
+                .setShopType(shopType)
+                .setBoughtNum(boughtNum)
+                .addGoodsList(ShopGoodsOuterClass.ShopGoods.newBuilder()
+                        .mergeFrom(sg)
+                        .setBoughtNum(boughtNum)
+                ).build();
+
+        this.setData(buyGoodsRsp);
+    }
+}
--- a/src/main/java/emu/grasscutter/server/packet/send/PacketChangeAvatarRsp.java
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketChangeAvatarRsp.java
@ -11,7 +11,7 @@ public class PacketChangeAvatarRsp extends BasePacket {
 		super(PacketOpcodes.ChangeAvatarRsp);

 		ChangeAvatarRsp p = ChangeAvatarRsp.newBuilder()
-				.setRetcode(RetcodeOuterClass.Retcode.RET_SVR_ERROR_VALUE)
+				.setRetcode(RetcodeOuterClass.Retcode.RET_SUCC_VALUE)
 				.setCurGuid(guid)
 				.build();
 		
--- a/src/main/java/emu/grasscutter/server/packet/send/PacketGetAllMailRsp.java
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketGetAllMailRsp.java
@ -14,32 +14,23 @@ import emu.grasscutter.net.proto.MailTextContentOuterClass.MailTextContent;

 import java.time.Instant;
 import java.util.ArrayList;
-import java.util.Base64;
 import java.util.List;

 public class PacketGetAllMailRsp extends BasePacket {

    public PacketGetAllMailRsp(Player player, boolean isGiftMail) {
        super(PacketOpcodes.GetAllMailRsp);
+        GetAllMailRsp.Builder proto = GetAllMailRsp.newBuilder();

        if (isGiftMail) {
-            // TODO: Gift Mail
-            // Make sure to send the stupid empty packet
-            Base64.Decoder decoder = Base64.getDecoder();
-            byte[] rsp = decoder.decode("IAE=");
-            try {
-                GetAllMailRsp var = GetAllMailRsp.parseFrom(rsp);
-                this.setData(var.toBuilder().build());
-            } catch (Exception e) {
-            }
-
+            proto.setIsGiftMail(true);
        } else {
+            proto.setIsGiftMail(false);
+
            if (player.getAllMail().size() != 0) { // Make sure the player has mail
-                GetAllMailRsp.Builder proto = GetAllMailRsp.newBuilder();
                List<MailData> mailDataList = new ArrayList<MailData>();

                for (Mail message : player.getAllMail()) {
-
                    if(message.stateValue == 1) { // Make sure it isn't a gift
                        if (message.expireTime > (int) Instant.now().getEpochSecond()) { // Make sure the message isn't expired (The game won't show expired mail, but I don't want to send unnecessary information).
                            if(mailDataList.size() <= 1000) { // Make sure that there isn't over 1000 messages in the mailbox. (idk what will happen if there is but the game probably won't like it.)
@ -79,17 +70,8 @@ public class PacketGetAllMailRsp extends BasePacket {

                proto.addAllMailList(mailDataList);
                proto.setIsTruncated(mailDataList.size() <= 1000 ? false : true); // When enabled this will send a notification to the user telling them their inbox is full and they should delete old messages when opening the mailbox.
-
-                this.setData(proto.build());
-            } else {
-                // Make sure to send the stupid empty packet
-                Base64.Decoder decoder = Base64.getDecoder();
-                byte[] rsp = decoder.decode("IAE=");
-                try {
-                    GetAllMailRsp var = GetAllMailRsp.parseFrom(rsp);
-                    this.setData(var.toBuilder().build());
-                } catch (Exception e) {}
            }
        }
+        this.setData(proto.build());
    }
 }
--- a/src/main/java/emu/grasscutter/server/packet/send/PacketGetPlayerFriendListRsp.java
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketGetPlayerFriendListRsp.java
@ -8,7 +8,7 @@ import emu.grasscutter.net.packet.PacketOpcodes;
 import emu.grasscutter.net.proto.FriendBriefOuterClass.FriendBrief;
 import emu.grasscutter.net.proto.FriendOnlineStateOuterClass.FriendOnlineState;
 import emu.grasscutter.net.proto.GetPlayerFriendListRspOuterClass.GetPlayerFriendListRsp;
-import emu.grasscutter.net.proto.HeadImageOuterClass.HeadImage;
+import emu.grasscutter.net.proto.ProfilePictureOuterClass.ProfilePicture;
 import emu.grasscutter.net.proto.PlatformTypeOuterClass;

 public class PacketGetPlayerFriendListRsp extends BasePacket {
@ -20,7 +20,7 @@ public class PacketGetPlayerFriendListRsp extends BasePacket {
 				.setUid(GameConstants.SERVER_CONSOLE_UID)
 				.setNickname("Server")
 				.setLevel(1)
-				.setAvatarId(HeadImage.newBuilder().setAvatarId(GameConstants.MAIN_CHARACTER_FEMALE).getAvatarId())
+				.setProfilePicture(ProfilePicture.newBuilder().setAvatarId(GameConstants.MAIN_CHARACTER_FEMALE))
 				.setWorldLevel(0)
 				.setSignature("")
 				.setLastActiveTime((int) (System.currentTimeMillis() / 1000f))
--- a/src/main/java/emu/grasscutter/server/packet/send/PacketGetShopRsp.java
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketGetShopRsp.java
@ -1,19 +1,60 @@
 package emu.grasscutter.server.packet.send;

+import emu.grasscutter.Grasscutter;
+import emu.grasscutter.game.player.Player;
+import emu.grasscutter.game.shop.ShopInfo;
+import emu.grasscutter.game.shop.ShopManager;
 import emu.grasscutter.net.packet.BasePacket;
 import emu.grasscutter.net.packet.PacketOpcodes;
-import emu.grasscutter.net.proto.GetShopRspOuterClass.GetShopRsp;
+import emu.grasscutter.net.proto.GetShopRspOuterClass;
+import emu.grasscutter.net.proto.ItemParamOuterClass;
+import emu.grasscutter.net.proto.ShopGoodsOuterClass.ShopGoods;
 import emu.grasscutter.net.proto.ShopOuterClass.Shop;

+import java.util.ArrayList;
+import java.util.List;
+import java.util.stream.Collectors;
+
 public class PacketGetShopRsp extends BasePacket {

-	public PacketGetShopRsp(int shopType) {
+	public PacketGetShopRsp(Player inv, int shopType) {
 		super(PacketOpcodes.GetShopRsp);

-		GetShopRsp proto = GetShopRsp.newBuilder()
-				.setShop(Shop.newBuilder().setShopType(shopType))
-				.build();
+		// TODO: CityReputationLevel
+		Shop.Builder shop = Shop.newBuilder()
+				.setShopType(shopType)
+				.setCityId(1) //mock
+				.setCityReputationLevel(10); //mock

-		this.setData(proto);
+		ShopManager manager = Grasscutter.getGameServer().getShopManager();
+		if (manager.getShopData().get(shopType) != null) {
+			List<ShopInfo> list = manager.getShopData().get(shopType);
+			List<ShopGoods> goodsList = new ArrayList<>();
+			for (ShopInfo info : list) {
+				ShopGoods.Builder goods = ShopGoods.newBuilder()
+						.setGoodsId(info.getGoodsId())
+						.setGoodsItem(ItemParamOuterClass.ItemParam.newBuilder().setItemId(info.getGoodsItem().getId()).setCount(info.getGoodsItem().getCount()).build())
+						.setScoin(info.getScoin())
+						.setHcoin(info.getHcoin())
+						.setBoughtNum(inv.getGoodsLimitNum(info.getGoodsId()))
+						.setBuyLimit(info.getBuyLimit())
+						.setBeginTime(info.getBeginTime())
+						.setEndTime(info.getEndTime())
+						.setNextRefreshTime(info.getNextRefreshTime())
+						.setMinLevel(info.getMinLevel())
+						.setMaxLevel(info.getMaxLevel())
+						.addAllPreGoodsIdList(info.getPreGoodsIdList())
+						.setMcoin(info.getMcoin())
+						.setDisableType(info.getDisableType())
+						.setSecondarySheetId(info.getSecondarySheetId());
+				if (info.getCostItemList() != null) {
+					goods.addAllCostItemList(info.getCostItemList().stream().map(x -> ItemParamOuterClass.ItemParam.newBuilder().setItemId(x.getId()).setCount(x.getCount()).build()).collect(Collectors.toList()));
+				}
+				goodsList.add(goods.build());
+			}
+			shop.addAllGoodsList(goodsList);
+		}
+
+		this.setData(GetShopRspOuterClass.GetShopRsp.newBuilder().setShop(shop).build());
 	}
 }
--- a/src/main/java/emu/grasscutter/server/packet/send/PacketSetPlayerHeadImageRsp.java
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketSetPlayerHeadImageRsp.java
@ -3,7 +3,7 @@ package emu.grasscutter.server.packet.send;
 import emu.grasscutter.game.player.Player;
 import emu.grasscutter.net.packet.BasePacket;
 import emu.grasscutter.net.packet.PacketOpcodes;
-import emu.grasscutter.net.proto.HeadImageOuterClass.HeadImage;
+import emu.grasscutter.net.proto.ProfilePictureOuterClass.ProfilePicture;
 import emu.grasscutter.net.proto.SetPlayerHeadImageRspOuterClass.SetPlayerHeadImageRsp;

 public class PacketSetPlayerHeadImageRsp extends BasePacket {
@ -12,7 +12,7 @@ public class PacketSetPlayerHeadImageRsp extends BasePacket {
 		super(PacketOpcodes.SetPlayerHeadImageRsp);
 		
 		SetPlayerHeadImageRsp proto = SetPlayerHeadImageRsp.newBuilder()
-				.setAvatarId(HeadImage.newBuilder().setAvatarId(player.getHeadImage()).getAvatarId())
+				.setProfilePicture(ProfilePicture.newBuilder().setAvatarId(player.getHeadImage()))
 				.build();
 		
 		this.setData(proto);
--- a/src/main/java/emu/grasscutter/server/packet/send/PacketUpdatePlayerShowAvatarListRsp.java
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketUpdatePlayerShowAvatarListRsp.java
@ -0,0 +1,22 @@
+package emu.grasscutter.server.packet.send;
+
+import emu.grasscutter.net.packet.BasePacket;
+import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.proto.UpdatePlayerShowAvatarListRspOuterClass.UpdatePlayerShowAvatarListRsp;
+
+import java.util.List;
+
+public class PacketUpdatePlayerShowAvatarListRsp extends BasePacket {
+
+    public PacketUpdatePlayerShowAvatarListRsp(boolean isShowAvatar, List<Integer> avatarIds) {
+        super(PacketOpcodes.UpdatePlayerShowAvatarListRsp);
+
+        UpdatePlayerShowAvatarListRsp proto = UpdatePlayerShowAvatarListRsp.newBuilder()
+                .setIsShowAvatar(isShowAvatar)
+                .addAllShowAvatarIdList(avatarIds)
+                .setRetcode(0)
+                .build();
+
+        this.setData(proto);
+    }
+}
--- a/src/main/java/emu/grasscutter/server/packet/send/PacketVehicleInteractRsp.java
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketVehicleInteractRsp.java
@ -0,0 +1,33 @@
+package emu.grasscutter.server.packet.send;
+
+import emu.grasscutter.Grasscutter;
+import emu.grasscutter.game.player.Player;
+import emu.grasscutter.game.entity.GameEntity;
+
+import emu.grasscutter.net.packet.BasePacket;
+import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.proto.VehicleInteractTypeOuterClass.VehicleInteractType;
+import emu.grasscutter.net.proto.VehicleInteractRspOuterClass.VehicleInteractRsp;
+import emu.grasscutter.net.proto.VehicleMemberOuterClass.VehicleMember;
+
+public class PacketVehicleInteractRsp extends BasePacket {
+
+	public PacketVehicleInteractRsp(Player player, int entityId, VehicleInteractType interactType) {
+		super(PacketOpcodes.VehicleInteractRsp);
+		VehicleInteractRsp.Builder proto = VehicleInteractRsp.newBuilder();
+
+		GameEntity vehicle = player.getScene().getEntityById(entityId);
+		if(vehicle != null) {
+			proto.setEntityId(vehicle.getId());
+			proto.setInteractType(interactType);
+
+			VehicleMember vehicleMember = VehicleMember.newBuilder()
+					.setUid(player.getUid())
+					.setAvatarGuid(player.getTeamManager().getCurrentCharacterGuid())
+					.build();
+
+			proto.setMember(vehicleMember);
+		}
+		this.setData(proto.build());
+	}
+}
--- a/src/main/java/emu/grasscutter/server/packet/send/PacketVehicleSpawnRsp.java
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketVehicleSpawnRsp.java
@ -0,0 +1,46 @@
+package emu.grasscutter.server.packet.send;
+
+import emu.grasscutter.Grasscutter;
+import emu.grasscutter.game.player.Player;
+import emu.grasscutter.game.entity.EntityVehicle;
+import emu.grasscutter.game.props.FightProperty;
+import emu.grasscutter.game.entity.GameEntity;
+
+import emu.grasscutter.net.packet.BasePacket;
+import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.proto.VehicleSpawnRspOuterClass.VehicleSpawnRsp;
+
+import emu.grasscutter.utils.Position;
+import it.unimi.dsi.fastutil.ints.Int2ObjectMap;
+
+public class PacketVehicleSpawnRsp extends BasePacket {
+
+	public PacketVehicleSpawnRsp(Player player, int vehicleId, int pointId, Position pos, Position rot) {
+		super(PacketOpcodes.VehicleSpawnRsp);
+		VehicleSpawnRsp.Builder proto = VehicleSpawnRsp.newBuilder();
+
+		EntityVehicle vehicle = new EntityVehicle(player.getScene(), player, vehicleId, pointId, pos, rot);
+
+		switch (vehicleId) {
+			// TODO: Not hardcode this. Waverider (skiff)
+			case 45001001,45001002 -> {
+				vehicle.addFightProperty(FightProperty.FIGHT_PROP_BASE_HP, 10000);
+				vehicle.addFightProperty(FightProperty.FIGHT_PROP_BASE_ATTACK, 100);
+				vehicle.addFightProperty(FightProperty.FIGHT_PROP_CUR_ATTACK, 100);
+				vehicle.addFightProperty(FightProperty.FIGHT_PROP_CUR_HP, 10000);
+				vehicle.addFightProperty(FightProperty.FIGHT_PROP_CUR_DEFENSE, 0);
+				vehicle.addFightProperty(FightProperty.FIGHT_PROP_CUR_SPEED, 0);
+				vehicle.addFightProperty(FightProperty.FIGHT_PROP_CHARGE_EFFICIENCY, 0);
+				vehicle.addFightProperty(FightProperty.FIGHT_PROP_MAX_HP, 10000);
+			}
+			default -> {}
+		}
+
+		player.getScene().addEntity(vehicle);
+
+		proto.setVehicleId(vehicleId);
+		proto.setEntityId(vehicle.getId());
+
+		this.setData(proto.build());
+	}
+}
--- a/src/main/java/emu/grasscutter/task/Task.java
+++ b/src/main/java/emu/grasscutter/task/Task.java
@ -1,5 +1,7 @@
 package emu.grasscutter.task;

+import org.quartz.JobDataMap;
+
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;

@ -27,4 +29,6 @@ public @interface Task {
    String taskName() default "NO_NAME";
    String taskCronExpression() default "0 0 0 0 0 ?";
    String triggerName() default "NO_NAME";
+    boolean executeImmediatelyAfterReset() default false;
+    boolean executeImmediately() default false;
 }
--- a/src/main/java/emu/grasscutter/task/TaskHandler.java
+++ b/src/main/java/emu/grasscutter/task/TaskHandler.java
@ -1,11 +1,26 @@
 package emu.grasscutter.task;

-import org.quartz.Job;
-import org.quartz.JobExecutionContext;
-import org.quartz.JobExecutionException;
+import org.quartz.*;

-public interface TaskHandler extends Job {
-    default void execute(JobExecutionContext context) throws JobExecutionException {
+@PersistJobDataAfterExecution
+public class TaskHandler implements Job {
+
+    public void restartExecute() throws JobExecutionException {
+        execute(null);
+    }
+
+    public void onEnable() {

    }
+
+    public void onDisable() {
+
+    }
+
+    @Override
+    public void execute(JobExecutionContext context) throws JobExecutionException {
+        // TODO Auto-generated method stub
+
+    }
+
 }
--- a/src/main/java/emu/grasscutter/task/TaskMap.java
+++ b/src/main/java/emu/grasscutter/task/TaskMap.java
@ -1,20 +1,9 @@
 package emu.grasscutter.task;

 import emu.grasscutter.Grasscutter;
-import emu.grasscutter.game.Account;
-import emu.grasscutter.game.player.Player;

-import org.quartz.CronScheduleBuilder;
-import org.quartz.CronTrigger;
-import org.quartz.JobBuilder;
-import org.quartz.JobDetail;
-import org.quartz.Scheduler;
-import org.quartz.SchedulerException;
-import org.quartz.SchedulerFactory;
-import org.quartz.Trigger;
-import org.quartz.TriggerBuilder;
+import org.quartz.*;
 import org.quartz.impl.StdSchedulerFactory;
-import org.quartz.spi.MutableTrigger;
 import org.reflections.Reflections;

 import java.util.*;
@ -23,6 +12,7 @@ import java.util.*;
 public final class TaskMap {
    private final Map<String, TaskHandler> tasks = new HashMap<>();
    private final Map<String, Task> annotations = new HashMap<>();
+    private final Map<String, TaskHandler> afterReset = new HashMap<>();
    private final SchedulerFactory schedulerFactory = new StdSchedulerFactory();
    
    public TaskMap() {
@ -37,6 +27,46 @@ public final class TaskMap {
        return Grasscutter.getGameServer().getTaskMap();
    }

+    public void resetNow() {
+        // Unregister all tasks
+        for (TaskHandler task : this.tasks.values()) {
+            unregisterTask(task);
+        }
+
+        // Run all afterReset tasks
+        for (TaskHandler task : this.afterReset.values()) {
+            try {
+                task.restartExecute();
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+        }
+
+        // Remove all afterReset tasks
+        this.afterReset.clear();
+
+        // Register all tasks
+        for (TaskHandler task : this.tasks.values()) {
+            registerTask(task.getClass().getAnnotation(Task.class).taskName(), task);
+        }
+    }
+
+    public TaskMap unregisterTask(TaskHandler task) {
+        this.tasks.remove(task.getClass().getAnnotation(Task.class).taskName());
+        this.annotations.remove(task.getClass().getAnnotation(Task.class).taskName());
+
+        try {
+            Scheduler scheduler = schedulerFactory.getScheduler();
+            scheduler.deleteJob(new JobKey(task.getClass().getAnnotation(Task.class).taskName()));
+        } catch (SchedulerException e) {
+            e.printStackTrace();
+        }
+
+        task.onDisable();
+
+        return this;
+    }
+
    public TaskMap registerTask(String taskName, TaskHandler task) {
        Task annotation = task.getClass().getAnnotation(Task.class);
        this.annotations.put(taskName, annotation);
@ -56,7 +86,11 @@ public final class TaskMap {
                        .build();
            
            scheduler.scheduleJob(job, convTrigger);
-            scheduler.start();
+
+            if (annotation.executeImmediately()) {
+                task.execute(null);
+            }
+            task.onEnable();
        } catch (SchedulerException e) {
            e.printStackTrace();
        }
@ -83,12 +117,24 @@ public final class TaskMap {
            try {
                Task taskData = annotated.getAnnotation(Task.class);
                Object object = annotated.newInstance();
-                if (object instanceof TaskHandler)
+                if (object instanceof TaskHandler) {
                    this.registerTask(taskData.taskName(), (TaskHandler) object);
-                else Grasscutter.getLogger().error("Class " + annotated.getName() + " is not a TaskHandler!");
+                    if (taskData.executeImmediatelyAfterReset()) {
+                        this.afterReset.put(taskData.taskName(), (TaskHandler) object);
+                    }
+                } else {
+                    Grasscutter.getLogger().error("Class " + annotated.getName() + " is not a TaskHandler!");
+                }
            } catch (Exception exception) {
                Grasscutter.getLogger().error("Failed to register task handler for " + annotated.getSimpleName(), exception);
            }
        });
+        try {
+            Scheduler scheduler = schedulerFactory.getScheduler();
+            scheduler.start();
+        } catch (SchedulerException e) {
+            e.printStackTrace();
+        }
+
    }
 }
--- a/src/main/java/emu/grasscutter/task/tasks/MoonCard.java
+++ b/src/main/java/emu/grasscutter/task/tasks/MoonCard.java
@ -1,27 +1,35 @@
 package emu.grasscutter.task.tasks;

-import emu.grasscutter.database.DatabaseManager;
-import emu.grasscutter.game.player.Player;
+import emu.grasscutter.Grasscutter;
 import emu.grasscutter.task.Task;
 import emu.grasscutter.task.TaskHandler;

-import java.util.List;

 import org.quartz.JobExecutionContext;
 import org.quartz.JobExecutionException;

@Task(taskName = "MoonCard", taskCronExpression = "0 0 0 * * ?", triggerName = "MoonCardTrigger")
 // taskCronExpression: Fixed time period: 0:0:0 every day (twenty-four hour system)
-public final class MoonCard implements TaskHandler {
+public class MoonCard extends TaskHandler {
+
    @Override
-    public void execute(JobExecutionContext context) throws JobExecutionException {
-        List<Player> players = DatabaseManager.getDatastore().find(Player.class).stream().toList();
-        for (Player player : players) {
+    public void onEnable() {
+        Grasscutter.getLogger().info("[Task] MoonCard task enabled.");
+    }
+
+    @Override
+    public void onDisable() {
+        Grasscutter.getLogger().info("[Task] MoonCard task disabled.");
+    }
+
+    @Override
+    public synchronized void execute(JobExecutionContext context) throws JobExecutionException {
+        Grasscutter.getGameServer().getPlayers().forEach((uid, player) -> {
            if (player.isOnline()) {
                if (player.inMoonCard()) {
                    player.getTodayMoonCard();
                }
            }
-        }
+        });
    }
 }
--- a/start.cmd
+++ b/start.cmd
@ -33,7 +33,7 @@ if not "%JAVA_PATH%" == "DO_NOT_CHECK_PATH" (
 		goto :EXIT
 	)
 ) else set JAVA_PATH=
-if not exist "%SERVER_PATH%grasscutter.jar" (
+if not exist "%SERVER_PATH%%SERVER_JAR_NAME%" (
 	call :LOG [ERROR] Server jar not found.
 	goto :EXIT
 )
@ -129,7 +129,7 @@ del /f /q "%temp%\db.vbs" >nul 2>nul

 :GAME
 call :LOG [INFO] Starting server...
-"%JAVA_PATH%java.exe" -jar "%SERVER_PATH%grasscutter.jar"
+"%JAVA_PATH%java.exe" -jar "%SERVER_PATH%%SERVER_JAR_NAME%"
 call :LOG [INFO] Server stopped

 :EXIT