Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
FROM java:openjdk-7-jdk
FROM amazoncorretto:8

RUN mkdir /compile

WORKDIR /compile

CMD [ "./compile.sh" ]
CMD [ "./compile.sh" ]
2 changes: 1 addition & 1 deletion makefile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
all:

mkdir -p bin
javac -Xlint:deprecation -source 1.6 -target 1.6 -d bin/ -sourcepath src/ -classpath bin/ src/Graphwar/*.java src/GraphServer/*.java src/GlobalServer/*.java src/RoomServer/*.java
javac -Xlint:deprecation -d bin/ -sourcepath src/ -classpath bin/ src/Graphwar/*.java src/GraphServer/*.java src/GlobalServer/*.java src/RoomServer/*.java
cp -r bin/Graphwar Graphwar
cp -r bin/GraphServer GraphServer
cp -r bin/GlobalServer GlobalServer
Expand Down
2 changes: 1 addition & 1 deletion src/Graphwar/GameData.java
Original file line number Diff line number Diff line change
Expand Up @@ -366,7 +366,7 @@ public void addPC(String name, int level)
{
if(players.size() < Constants.MAX_PLAYERS)
{
nextPCs.add(new Integer(level));
nextPCs.add(level);

addPlayer(name);
}
Expand Down
2 changes: 1 addition & 1 deletion src/Graphwar/GlobalScreen.java
Original file line number Diff line number Diff line change
Expand Up @@ -233,7 +233,7 @@ public void showMessage(String message)
showMessage = true;
this.message = message;

FontMetrics fontMetrics = Toolkit.getDefaultToolkit().getFontMetrics (Constants.NAME_FONT);
FontMetrics fontMetrics = this.getFontMetrics(Constants.NAME_FONT);
int messageLength = fontMetrics.stringWidth(message);

this.messageX = (Constants.WIDTH - messageLength)/2;
Expand Down
2 changes: 1 addition & 1 deletion src/Graphwar/MainMenuScreen.java
Original file line number Diff line number Diff line change
Expand Up @@ -295,7 +295,7 @@ public void showMessage(String message)
showMessage = true;
this.message = message;

FontMetrics fontMetrics = Toolkit.getDefaultToolkit().getFontMetrics (Constants.NAME_FONT);
FontMetrics fontMetrics = this.getFontMetrics(Constants.NAME_FONT);
int messageLength = fontMetrics.stringWidth(message);

this.messageX = (Constants.WIDTH - messageLength)/2;
Expand Down