Mirror/Grasscutter
1
0
Fork 0
mirror of https://github.com/Grasscutters/Grasscutter.git synced 2025-12-18 18:05:05 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'development' into unstable-quests

Browse Source 
# Conflicts:
#	src/main/java/emu/grasscutter/command/commands/SetPropCommand.java
This commit is contained in:
KingRainbow44
2023-04-24 21:00:03 -04:00
parent 52ac9cd75e 60e8106b01
commit 34c3c6229f
2 changed files with 11 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/main/java/emu/grasscutter/command/commands/SetPropCommand.java
View File

@@ -1,5 +1,10 @@
package emu.grasscutter.command.commands;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.stream.IntStream;
import emu.grasscutter.command.Command;
import emu.grasscutter.command.CommandHandler;
import emu.grasscutter.data.GameData;
@@ -9,9 +14,6 @@ import emu.grasscutter.game.tower.TowerLevelRecord;
import emu.grasscutter.server.packet.send.PacketOpenStateChangeNotify;
import emu.grasscutter.server.packet.send.PacketSceneAreaUnlockNotify;
import emu.grasscutter.server.packet.send.PacketScenePointUnlockNotify;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@Command(
label = "setProp",
@@ -22,11 +24,8 @@ import java.util.Map;
public final class SetPropCommand implements CommandHandler {
// List of map areas. Unfortunately, there is no readily available source for them in excels or
// bins.
private static final List<Integer> sceneAreas =
List.of(
1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27,
28, 29, 32, 100, 101, 102, 103, 200, 210, 300, 400, 401, 402, 403);
Map<String, Prop> props;
private static final List<Integer> sceneAreas = IntStream.range(1, 1000).boxed().toList();
private final Map<String, Prop> props;
public SetPropCommand() {
this.props = new HashMap<>();