Upstream/Citizens2
1
0
Fork 0
mirror of https://github.com/CitizensDev/Citizens2.git synced 2024-11-28 13:45:18 +01:00
Code Issues Projects Releases Wiki Activity

Fixed characters having no valid mob types by default.

Browse Source
This commit is contained in:
aPunch 2012-03-12 01:44:16 -05:00
parent 1082f57938
commit 60e65e9343
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/main/java/net/citizensnpcs/command/command/NPCCommands.java
View File

@ -50,6 +50,7 @@ public class NPCCommands {
public void character(CommandContext args, Player player, NPC npc) throws CommandException { public void character(CommandContext args, Player player, NPC npc) throws CommandException {
String name = args.getString(1).toLowerCase(); String name = args.getString(1).toLowerCase();
Character character = characterManager.getCharacter(name); Character character = characterManager.getCharacter(name);
if (character == null) if (character == null)
throw new CommandException("The character '" + args.getString(1) + "' does not exist."); throw new CommandException("The character '" + args.getString(1) + "' does not exist.");
if (npc.getCharacter() != null && npc.getCharacter().getName().equalsIgnoreCase(character.getName())) if (npc.getCharacter() != null && npc.getCharacter().getName().equalsIgnoreCase(character.getName()))
@ -57,6 +58,12 @@ public class NPCCommands {
if (!player.hasPermission("citizens.npc.character." + character.getName()) if (!player.hasPermission("citizens.npc.character." + character.getName())
&& !player.hasPermission("citizens.npc.character.*") && !player.hasPermission("citizens.admin")) && !player.hasPermission("citizens.npc.character.*") && !player.hasPermission("citizens.admin"))
throw new NoPermissionsException(); throw new NoPermissionsException();
EntityType type = EntityType.valueOf(npc.getTrait(MobType.class).getType());
if (!character.getValidTypes().isEmpty() && !character.getValidTypes().contains(type)) {
Messaging.sendError(player, "This NPC cannot be given the character '" + character.getName() + "'.");
return;
}
Messaging.send(player, StringHelper.wrap(npc.getName() + "'s") + " character is now '" Messaging.send(player, StringHelper.wrap(npc.getName() + "'s") + " character is now '"
+ StringHelper.wrap(name) + "'."); + StringHelper.wrap(name) + "'.");
npc.setCharacter(character); npc.setCharacter(character);
@ -94,7 +101,7 @@ public class NPCCommands {
return; return;
} else { } else {
Character set = characterManager.getCharacter(character); Character set = characterManager.getCharacter(character);
if (!set.getValidTypes().contains(type)) { if (!set.getValidTypes().isEmpty() && !set.getValidTypes().contains(type)) {
Messaging.sendError(player, "The character '" + set.getName() + "' cannot be given the mob type '" Messaging.sendError(player, "The character '" + set.getName() + "' cannot be given the mob type '"
+ type.name().toLowerCase() + "'."); + type.name().toLowerCase() + "'.");
create.remove(); create.remove();