Merge branch 'development'

This commit is contained in:
Brianna 2020-08-05 15:47:43 -05:00
commit a6c1570060
2 changed files with 8 additions and 2 deletions

View File

@ -2,7 +2,7 @@
<groupId>com.songoda</groupId> <groupId>com.songoda</groupId>
<artifactId>UltimateStacker</artifactId> <artifactId>UltimateStacker</artifactId>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<version>1.11.17</version> <version>1.11.18</version>
<build> <build>
<defaultGoal>clean install</defaultGoal> <defaultGoal>clean install</defaultGoal>
<finalName>UltimateStacker-${project.version}</finalName> <finalName>UltimateStacker-${project.version}</finalName>
@ -71,6 +71,12 @@
<exclude>META-INF/*.RSA</exclude> <exclude>META-INF/*.RSA</exclude>
</excludes> </excludes>
</filter> </filter>
<filter>
<artifact>com.songoda:Lootables</artifact>
<excludes>
<exclude>com/songoda/core/**</exclude>
</excludes>
</filter>
</filters> </filters>
<relocations> <relocations>
<relocation> <relocation>

View File

@ -33,8 +33,8 @@ public class CommandGiveSpawner extends AbstractCommand {
} }
EntityType type = null; EntityType type = null;
String input = args[1].toUpperCase().replace("_", "").replace(" ", "");
for (EntityType types : EntityType.values()) { for (EntityType types : EntityType.values()) {
String input = args[1].toUpperCase().replace("_", "").replace(" ", "");
String compare = types.name().toUpperCase().replace("_", "").replace(" ", ""); String compare = types.name().toUpperCase().replace("_", "").replace(" ", "");
if (input.equals(compare)) if (input.equals(compare))
type = types; type = types;