Upstream/Citizens2
1
0
Fork 0
mirror of https://github.com/CitizensDev/Citizens2.git synced 2024-08-09 14:12:55 +02:00
Code Issues Projects Releases Wiki Activity

Wolf Traits now give Feedback.

Browse Source
This commit is contained in:
sanjay900 2014-12-19 00:16:31 +13:00
parent 1447380e83
commit 6c17804653
4 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1593,6 +1593,7 @@ public class NPCCommands {
throw new CommandException(Messages.COLLAR_COLOUR_NOT_RECOGNISED);
trait.setCollarColor(color);
}
Messaging.sendTr(sender, Messages.WOLF_TRAIT_UPDATED, npc.getName(), args.hasFlag('a'), args.hasFlag('s'), args.hasFlag('t'),trait.getCollarColor().name());
}
@Command(

4
src/main/java/net/citizensnpcs/trait/WolfModifiers.java
View File

@ -54,4 +54,8 @@ public class WolfModifiers extends Trait {
wolf.setTamed(tamed);
}
}
public DyeColor getCollarColor() {
return collarColor;
}
}

1
src/main/java/net/citizensnpcs/util/Messages.java
View File

@ -258,6 +258,7 @@ public class Messages {
public static final String WAYPOINT_TRIGGER_REMOVE_PROMPT = "citizens.editors.waypoints.triggers.remove.prompt";
public static final String WAYPOINT_TRIGGER_REMOVE_REMOVED = "citizens.editors.waypoints.triggers.remove.removed";
public static final String WAYPOINT_TRIGGER_TELEPORT_PROMPT = "citizens.editors.waypoints.triggers.teleport.prompt";
public static final String WOLF_TRAIT_UPDATED="citizens.commands.wolf.traits-updated";
public static final String WORLD_NOT_FOUND = "citizens.commands.errors.missing-world";
public static final String WRITING_DEFAULT_SETTING = "citizens.settings.writing-default";
public static final String ZOMBIE_BABY_SET = "citizens.commands.npc.zombiemod.baby-set";

1
src/main/resources/messages_en.properties
View File

@ -155,6 +155,7 @@ citizens.commands.traitc.missing=Trait not found.
citizens.commands.traitc.not-configurable=That trait is not configurable.
citizens.commands.traitc.not-on-npc=The NPC doesn''t have that trait.
citizens.commands.unknown-command=Unknown command. Did you mean:
citizens.commands.wolf.traits-updated=[[{0}]]''s Traits were updated. Angry:[[{1}]], Sitting:[[{2}]], Tamed:[[{3}]], Collar Color:[[{4}]]
citizens.conversations.selection.invalid-choice=[[{0}]] is not a valid option.
citizens.economy.error-loading=Unable to use economy handling. Has Vault been enabled?
citizens.economy.minimum-cost-required=Need at least [[{0}]].