Upstream/Citizens2
1
0
Fork 0
mirror of https://github.com/CitizensDev/Citizens2.git synced 2024-09-28 23:27:40 +02:00
Code Issues Projects Releases Wiki Activity

Remove -24000 limit of /npc age

Browse Source
This commit is contained in:
fullwall 2014-03-07 13:08:24 +08:00
parent f3e2ccb309
commit 22759739f1
3 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -118,7 +118,7 @@ public class NPCCommands {
int age = 0;
try {
age = args.getInteger(1);
if (age < -24000 || age > 0) {
if (age > 0) {
throw new CommandException(Messages.INVALID_AGE);
}
Messaging.sendTr(sender, Messages.AGE_SET_NORMAL, npc.getName(), age);
@ -265,7 +265,7 @@ public class NPCCommands {
}
CommandSenderCreateNPCEvent event = sender instanceof Player ? new PlayerCreateNPCEvent((Player) sender, copy)
: new CommandSenderCreateNPCEvent(sender, copy);
: new CommandSenderCreateNPCEvent(sender, copy);
Bukkit.getPluginManager().callEvent(event);
if (event.isCancelled()) {
event.getNPC().destroy();
@ -337,7 +337,7 @@ public class NPCCommands {
spawnLoc = args.getSenderLocation();
}
CommandSenderCreateNPCEvent event = sender instanceof Player ? new PlayerCreateNPCEvent((Player) sender, npc)
: new CommandSenderCreateNPCEvent(sender, npc);
: new CommandSenderCreateNPCEvent(sender, npc);
Bukkit.getPluginManager().callEvent(event);
if (event.isCancelled()) {
npc.destroy();
@ -1009,7 +1009,7 @@ public class NPCCommands {
@Requirements(selected = true, ownership = true, types = { EntityType.CREEPER })
public void power(CommandContext args, CommandSender sender, NPC npc) {
Messaging
.sendTr(sender, npc.getTrait(Powered.class).toggle() ? Messages.POWERED_SET : Messages.POWERED_STOPPED);
.sendTr(sender, npc.getTrait(Powered.class).toggle() ? Messages.POWERED_SET : Messages.POWERED_STOPPED);
}
@Command(

3
src/main/java/net/citizensnpcs/trait/waypoint/triggers/DelayTrigger.java
View File

@ -31,8 +31,9 @@ public class DelayTrigger implements WaypointTrigger {
@Override
public void onWaypointReached(NPC npc, Location waypoint) {
if (delay > 0)
if (delay > 0) {
scheduleTask(npc.getTrait(Waypoints.class).getCurrentProvider());
}
}
private void scheduleTask(final WaypointProvider provider) {

3
src/main/java/net/citizensnpcs/trait/waypoint/triggers/TriggerAddPrompt.java
View File

@ -42,8 +42,9 @@ public class TriggerAddPrompt extends StringPrompt {
context.setSessionData(WaypointTriggerPrompt.CREATED_TRIGGER_KEY, null);
Messaging.sendTr((CommandSender) context.getForWhom(), Messages.WAYPOINT_TRIGGER_ADDED_SUCCESSFULLY,
returned.description());
} else
} else {
Messaging.sendErrorTr((CommandSender) context.getForWhom(), Messages.WAYPOINT_TRIGGER_EDITOR_INACTIVE);
}
}
if (context.getSessionData("said") == Boolean.TRUE)
return "";