Upstream
/
Citizens2
mirror of https://github.com/CitizensDev/Citizens2.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch '1.8' of github.com:CitizensDev/Citizens2 into 1.8

This commit is contained in:
fullwall 2014-11-30 13:33:09 +08:00
parent 6ca4834e70 72c176bf24
commit 15efc9f838
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pom.xml
View File

@ -6,13 +6,13 @@
<groupId>net.citizensnpcs</groupId>
<artifactId>citizens</artifactId>
<version>2.0.13-SNAPSHOT</version>
<version>2.0.14-SNAPSHOT</version>
<name>Citizens</name>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<craftbukkit.version>1.7.10-R0.1-SNAPSHOT</craftbukkit.version>
<citizensapi.version>2.0.13-SNAPSHOT</citizensapi.version>
<craftbukkit.version>1.8-R0.1-SNAPSHOT</craftbukkit.version>
<citizensapi.version>2.0.14-SNAPSHOT</citizensapi.version>
<vault.version>1.4.1</vault.version>
<powermock.version>1.4.12</powermock.version>
<build.number>Unknown</build.number>
@ -42,7 +42,7 @@
</pluginRepositories>
<dependencies>
<!--<dependency>
<dependency>
<groupId>org.bukkit</groupId>
<artifactId>bukkit</artifactId>
<version>${craftbukkit.version}</version>
@ -55,7 +55,7 @@
<version>${craftbukkit.version}</version>
<type>jar</type>
<scope>provided</scope>
</dependency>-->
</dependency>
<dependency>
<groupId>net.citizensnpcs</groupId>
<artifactId>citizensapi</artifactId>

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

@ -296,7 +296,7 @@ public class NPCCommands {
EntityType type = EntityType.PLAYER;
if (args.hasValueFlag("type")) {
String inputType = args.getFlag("type");
String inputType = args.getFlag("type").toUpperCase();
type = Util.matchEntityType(inputType);
if (type == null) {
throw new CommandException(Messaging.tr(Messages.NPC_CREATE_INVALID_MOBTYPE, inputType));