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

Closes gh-357. Bombs and cakes now get saved properly when there are no monuments in the zone. Autoedits to project and classpath for standalone build by m2eclipse.

This commit is contained in:
Thomas-Antoine O'Neill 2012-01-20 19:56:37 -05:00
parent 6ff3cbe0c3
commit 4e1b5670a4
3 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
war/.classpath
View File

@ -1,13 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" output="target/classes" path="src/main/java"/>
<classpathentry kind="src" path="src/test/java"/>
<classpathentry including="**/*.java" kind="src" output="target/classes" path="src/main/java"/>
<classpathentry kind="src" output="target/test-classes" path="src/test/java"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER"/>
<classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
<classpathentry combineaccessrules="false" kind="src" path="/bukkit"/>
<classpathentry combineaccessrules="false" kind="src" path="/craftbukkit"/>
<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/>
<classpathentry kind="lib" path="C:/dev/war/war/lib/mockito-all-1.8.5.jar"/>
<classpathentry kind="lib" path="C:/dev/war/war/lib/SpoutPluginAPI.jar"/>
<classpathentry kind="output" path="target/classes"/>
</classpath>

6
war/.project
View File

@ -20,8 +20,14 @@
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.eclipse.m2e.core.maven2Builder</name>
<arguments>
</arguments>
</buildCommand>
</buildSpec>
<natures>
<nature>org.eclipse.m2e.core.maven2Nature</nature>
<nature>org.eclipse.jdt.core.javanature</nature>
<nature>org.maven.ide.eclipse.maven2Nature</nature>
<nature>net.sourceforge.metrics.nature</nature>

4
war/src/main/java/com/tommytony/war/mappers/WarzoneYmlMapper.java
View File

@ -343,7 +343,7 @@ public class WarzoneYmlMapper {
}
// bombs
if (warzone.getMonuments().size() > 0) {
if (warzone.getBombs().size() > 0) {
ConfigurationSection bombsSection = warzoneInfoSection.createSection("bomb");
List<String> bombNames = new ArrayList<String>();
@ -363,7 +363,7 @@ public class WarzoneYmlMapper {
}
// cakes
if (warzone.getMonuments().size() > 0) {
if (warzone.getCakes().size() > 0) {
ConfigurationSection cakesSection = warzoneInfoSection.createSection("cake");
List<String> cakeNames = new ArrayList<String>();