Skip to content

Commit

Permalink
ninjafix
Browse files Browse the repository at this point in the history
  • Loading branch information
dries007 committed Sep 21, 2014
1 parent b9cb03d commit 5c9821f
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ apply plugin: "idea-utils"

archivesBaseName = "D3Backend"
group = "net.doubledoordev.backend"
version = "0.0.0"
version = "0.1.1"

def vendor = "DoubleDoorDevelopment"
def gitURL = "github.com/DoubleDoorDevelopment/D3Backend"
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/net/doubledoordev/backend/Main.java
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ public static void main(String[] args) throws Exception
LOGGER.info("Finding Java versions...");
//noinspection ResultOfMethodCallIgnored
Constants.JAVAPATH.length();

Settings.save();
LOGGER.info("Making necessary folders...");
mkdirs();
LOGGER.info("Starting webserver...");
Expand Down
6 changes: 3 additions & 3 deletions src/main/java/net/doubledoordev/backend/server/Server.java
Original file line number Diff line number Diff line change
Expand Up @@ -562,6 +562,7 @@ public List<String> getAdmins()
@SuppressWarnings("UnusedDeclaration")
public String getPropertiesAsText()
{
getProperties();
StringWriter stringWriter = new StringWriter();
try
{
Expand Down Expand Up @@ -644,12 +645,11 @@ public void run()
amount = getPermGen();
if (amount > 0) arguments.add(String.format("-XX:MaxPermSize=%dm", amount));
}

arguments.addAll(data.extraJavaParameters);
for (String s : data.extraJavaParameters) if (s.trim().length() != 0) arguments.add(s.trim());
arguments.add("-jar");
arguments.add(data.jarName);
arguments.add("nogui");
arguments.addAll(data.extraMCParameters);
for (String s : data.extraMCParameters) if (s.trim().length() != 0) arguments.add(s.trim());

// Debug printout
logger.info("Arguments: " + arguments.toString());
Expand Down

0 comments on commit 5c9821f

Please sign in to comment.