Upstream/Citizens2
1
0
Fork 0
mirror of https://github.com/CitizensDev/Citizens2.git synced 2025-02-04 06:21:28 +01:00
Code Issues Projects Releases Wiki Activity

Add /npc create -t and make named registry autocreate

Browse Source
This commit is contained in:
fullwall 2021-02-27 14:41:05 +08:00
parent 0b41b24425
commit 8afaf23c1d
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
main/src/main/java/net/citizensnpcs/commands/NPCCommands.java
View File

@ -68,6 +68,7 @@ import net.citizensnpcs.api.event.PlayerCloneNPCEvent;
import net.citizensnpcs.api.event.PlayerCreateNPCEvent;
import net.citizensnpcs.api.event.SpawnReason;
import net.citizensnpcs.api.gui.InventoryMenu;
import net.citizensnpcs.api.npc.MemoryNPCDataStore;
import net.citizensnpcs.api.npc.NPC;
import net.citizensnpcs.api.npc.NPCRegistry;
import net.citizensnpcs.api.trait.Trait;
@ -127,9 +128,11 @@ import net.citizensnpcs.util.Util;
@Requirements(selected = true, ownership = true)
public class NPCCommands {
private final NPCSelector selector;
private final NPCRegistry temporaryRegistry;
public NPCCommands(Citizens plugin) {
selector = plugin.getNPCSelector();
temporaryRegistry = CitizensAPI.createCitizensBackedNPCRegistry(new MemoryNPCDataStore());
}
@Command(
@ -449,9 +452,9 @@ public class NPCCommands {
@Command(
aliases = { "npc" },
usage = "create [name] ((-b(aby),u(nspawned),s(ilent)) --at [x:y:z:world] --type [type] --trait ['trait1, trait2...'] --registry [registry name])",
usage = "create [name] ((-b(aby),u(nspawned),s(ilent),t(emporary)) --at [x:y:z:world] --type [type] --trait ['trait1, trait2...'] --registry [registry name])",
desc = "Create a new NPC",
flags = "bus",
flags = "bust",
modifiers = { "create" },
min = 2,
permission = "citizens.npc.create")
@ -484,9 +487,14 @@ public class NPCCommands {
if (args.hasValueFlag("registry")) {
registry = CitizensAPI.getNamedNPCRegistry(args.getFlag("registry"));
if (registry == null) {
throw new CommandException("Unknown NPC registry name");
registry = CitizensAPI.createNamedNPCRegistry(name, new MemoryNPCDataStore());
Messaging.send(sender, "An in-memory registry has been created named [[" + name + "]].");
}
}
if (args.hasFlag('t')) {
registry = temporaryRegistry;
}
npc = registry.createNPC(type, name);
String msg = "You created [[" + npc.getName() + "]] (ID [[" + npc.getId() + "]])";