Upstream/Paper
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-11-26 20:46:59 +01:00
Code Issues Projects Releases Wiki Activity

Update for cleanup in Bukkit

Browse Source
This commit is contained in:
Erik Broes 2011-12-25 15:35:12 +01:00
parent 81c751a8a3
commit 834c420257
2 changed files with 31 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
pom.xml
View File

@ -203,41 +203,42 @@
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId> <artifactId>maven-surefire-plugin</artifactId>
<version>2.11</version>
<configuration> <configuration>
<workingDirectory>${basedir}/target/test-server</workingDirectory> <workingDirectory>${basedir}/target/test-server</workingDirectory>
</configuration> </configuration>
</plugin> </plugin>
</plugins> </plugins>
<pluginManagement> <pluginManagement>
<plugins> <plugins>
<!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.--> <!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.-->
<plugin> <plugin>
<groupId>org.eclipse.m2e</groupId> <groupId>org.eclipse.m2e</groupId>
<artifactId>lifecycle-mapping</artifactId> <artifactId>lifecycle-mapping</artifactId>
<version>1.0.0</version> <version>1.0.0</version>
<configuration> <configuration>
<lifecycleMappingMetadata> <lifecycleMappingMetadata>
<pluginExecutions> <pluginExecutions>
<pluginExecution> <pluginExecution>
<pluginExecutionFilter> <pluginExecutionFilter>
<groupId>com.lukegb.mojo</groupId> <groupId>com.lukegb.mojo</groupId>
<artifactId> <artifactId>
gitdescribe-maven-plugin gitdescribe-maven-plugin
</artifactId> </artifactId>
<versionRange>[1.3,)</versionRange> <versionRange>[1.3,)</versionRange>
<goals> <goals>
<goal>gitdescribe</goal> <goal>gitdescribe</goal>
</goals> </goals>
</pluginExecutionFilter> </pluginExecutionFilter>
<action> <action>
<ignore></ignore> <ignore></ignore>
</action> </action>
</pluginExecution> </pluginExecution>
</pluginExecutions> </pluginExecutions>
</lifecycleMappingMetadata> </lifecycleMappingMetadata>
</configuration> </configuration>
</plugin> </plugin>
</plugins> </plugins>
</pluginManagement> </pluginManagement>
</build> </build>
</project> </project>

1
src/main/java/org/bukkit/craftbukkit/CraftServer.java
View File

@ -712,6 +712,7 @@ public final class CraftServer implements Server {
return true; return true;
} }
@SuppressWarnings("unchecked")
public Map<String, String[]> getCommandAliases() { public Map<String, String[]> getCommandAliases() {
ConfigurationSection section = configuration.getConfigurationSection("aliases"); ConfigurationSection section = configuration.getConfigurationSection("aliases");
Map<String, String[]> result = new LinkedHashMap<String, String[]>(); Map<String, String[]> result = new LinkedHashMap<String, String[]>();