From 4b83f8d956590313a11a5d093fb14d05d74ac264 Mon Sep 17 00:00:00 2001 From: aPunch Date: Tue, 20 Mar 2012 19:29:13 -0500 Subject: [PATCH] Format --- pom.xml | 198 +++++++++--------- .../command/command/NPCCommands.java | 4 +- 2 files changed, 101 insertions(+), 101 deletions(-) diff --git a/pom.xml b/pom.xml index f797627da..ea6db3922 100644 --- a/pom.xml +++ b/pom.xml @@ -1,115 +1,115 @@ - 4.0.0 + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + 4.0.0 - net.citizensnpcs - citizens - 2.0-SNAPSHOT - Citizens + net.citizensnpcs + citizens + 2.0-SNAPSHOT + Citizens - - UTF-8 - 1.2.3-R0.2-SNAPSHOT - 1.2.3-R0.2-SNAPSHOT - 2.0-SNAPSHOT - Unknown - + + UTF-8 + 1.2.3-R0.2-SNAPSHOT + 1.2.3-R0.2-SNAPSHOT + 2.0-SNAPSHOT + Unknown + - - - bukkit-repo - http://repo.bukkit.org/content/groups/public/ - + + + bukkit-repo + http://repo.bukkit.org/content/groups/public/ + - - everything - http://repo.citizensnpcs.net/ - - + + everything + http://repo.citizensnpcs.net/ + + - - - org.bukkit - craftbukkit - ${craftbukkit.version} - jar - provided - - - net.citizensnpcs - citizensapi - ${citizensapi.version} - jar - compile - - - org.bukkit - bukkit - ${bukkit.version} - jar - provided - - + + + org.bukkit + craftbukkit + ${craftbukkit.version} + jar + provided + + + net.citizensnpcs + citizensapi + ${citizensapi.version} + jar + compile + + + org.bukkit + bukkit + ${bukkit.version} + jar + provided + + - http://www.citizensnpcs.net - - jenkins - http://ci.citizensnpcs.net - - - scm:git:git://github.com/CitizensDev/Citizens2.git - scm:git:git:@github.com:CitizensDev/Citizens2.git - https://github.com/CitizensDev/Citizens2/tree/master/ - - - clean package install - ${basedir}/src/main/java + http://www.citizensnpcs.net + + jenkins + http://ci.citizensnpcs.net + + + scm:git:git://github.com/CitizensDev/Citizens2.git + scm:git:git:@github.com:CitizensDev/Citizens2.git + https://github.com/CitizensDev/Citizens2/tree/master/ + + + clean package install + ${basedir}/src/main/java - - - . - true - ${basedir}/src/main/resources - - plugin.yml - - - + + + . + true + ${basedir}/src/main/resources + + plugin.yml + + + - + - - org.apache.maven.plugins - maven-compiler-plugin - 2.3.2 - - 1.6 - 1.6 - - + + org.apache.maven.plugins + maven-compiler-plugin + 2.3.2 + + 1.6 + 1.6 + + - - org.apache.maven.plugins - maven-jar-plugin - 2.3.2 - + + org.apache.maven.plugins + maven-jar-plugin + 2.3.2 + - - org.apache.maven.plugins - maven-shade-plugin - 1.4 - - - package - - shade - - - - - - + + org.apache.maven.plugins + maven-shade-plugin + 1.4 + + + package + + shade + + + + + + \ No newline at end of file diff --git a/src/main/java/net/citizensnpcs/command/command/NPCCommands.java b/src/main/java/net/citizensnpcs/command/command/NPCCommands.java index 1594663d1..cbc1b9cfe 100644 --- a/src/main/java/net/citizensnpcs/command/command/NPCCommands.java +++ b/src/main/java/net/citizensnpcs/command/command/NPCCommands.java @@ -65,8 +65,8 @@ public class NPCCommands { Messaging.sendError(player, "This NPC cannot be given the character '" + character.getName() + "'."); return; } - Messaging.send(player, - StringHelper.wrap(npc.getName() + "'s") + " character is now '" + StringHelper.wrap(name) + "'."); + Messaging.send(player, StringHelper.wrap(npc.getName() + "'s") + " character is now " + StringHelper.wrap(name) + + "."); npc.setCharacter(character); }