Merge pull request nimmis#40 from 25/master

Fixed an error that prevents building
spaceshiptrip · Sep 29, 2019 · 8a02099 · 8a02099
2 parents 4713057 + cf3999f
commit 8a02099
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1 @@
+.DS_Store
diff --git a/rootfs/etc/init.d/minecraft_server b/rootfs/etc/init.d/minecraft_server
@@ -211,7 +211,7 @@ buildjar() {
     export HOME
     cd $HOME
     git config --global --unset core.autocrlf
-    java -jar BuildTools.jar --rev $1
+    java -Xmx1024M -jar BuildTools.jar --rev $1
     cp /build-mc/Spigot/Spigot-Server/target/spigot-*.jar $SPIGOT_HOME/spigot-$1.jar
     cd $SPIGOT_HOME/
     rm -Rf /build-mc