Forráskód Böngészése

Merge branch 'master' into refactoring

RedstoneFuture 3 éve
szülő
commit
7b1bdc5ab2

+ 1 - 1
missilewars-plugin/pom.xml

@@ -26,7 +26,7 @@
         <version>1.0</version>
     </parent>
 
-    <version>4.2.0</version>
+    <version>4.2.1</version>
 
     <modelVersion>4.0.0</modelVersion>
 

+ 1 - 1
missilewars-plugin/src/main/java/de/butzlabben/missilewars/game/Arenas.java

@@ -48,7 +48,7 @@ public class Arenas {
         // Get all arena files or create a new one
         File[] files = folder.listFiles();
         if (files.length == 0) {
-            File defaultArena = new File(folder, "arena.yml");
+            File defaultArena = new File(folder, "arena0.yml");
             try {
                 defaultArena.createNewFile();
                 Serializer.serialize(defaultArena, new Arena());

+ 1 - 1
missilewars-plugin/src/main/java/de/butzlabben/missilewars/wrapper/abstracts/Lobby.java

@@ -58,7 +58,7 @@ public class Lobby {
     private Area area = Area.defaultAreaAround(Bukkit.getWorlds().get(0).getSpawnLocation());
     @SerializedName("map_choose_procedure") private MapChooseProcedure mapChooseProcedure = MapChooseProcedure.FIRST;
     @SerializedName("possible_arenas") private List<String> possibleArenas = new ArrayList<String>() {{
-        add("arena");
+        add("arena0");
     }};
 
     @Setter private transient File file;

+ 1 - 0
pom.xml

@@ -143,6 +143,7 @@
                 <artifactId>maven-compiler-plugin</artifactId>
                 <version>3.5.1</version>
                 <configuration>
+                    <forceJavacCompilerUse>true</forceJavacCompilerUse>
                     <source>11</source>
                     <target>11</target>
                 </configuration>