diff --git a/download/mapping-1.2.1.jar b/download/mapping-1.2.1.jar new file mode 100644 index 0000000..7114559 Binary files /dev/null and b/download/mapping-1.2.1.jar differ diff --git a/download/mapping-1.2.jar b/download/mapping-1.2.jar deleted file mode 100644 index dbc2a80..0000000 Binary files a/download/mapping-1.2.jar and /dev/null differ diff --git a/make_jar.bat b/make_jar.bat deleted file mode 100644 index f1f3a92..0000000 --- a/make_jar.bat +++ /dev/null @@ -1,2 +0,0 @@ -mvn clean package && del download\*.jar && xcopy /Y target\*.jar download && git add download/*.jar -pause \ No newline at end of file diff --git a/pom.xml b/pom.xml index f5d2091..1589a80 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ fr.klemek mapping - 1.2 + 1.2.1 @@ -80,6 +80,7 @@ maven-jar-plugin 3.1.0 + download fr.klemek.mapping.Launch diff --git a/src/main/java/fr/klemek/mapping/MainWindow.java b/src/main/java/fr/klemek/mapping/MainWindow.java index 3da6093..3939fb3 100644 --- a/src/main/java/fr/klemek/mapping/MainWindow.java +++ b/src/main/java/fr/klemek/mapping/MainWindow.java @@ -9,7 +9,7 @@ import javax.swing.*; class MainWindow extends JFrame { static final String FILE_NAME = "mapping.csv"; - private static final String VERSION = "1.2"; + private static final String VERSION = "1.2.1"; private static final int DEFAULT_SIZE = 17; private static final String INFO_TEXT = "" + "" + diff --git a/src/main/java/fr/klemek/mapping/Map.java b/src/main/java/fr/klemek/mapping/Map.java index d2ecd1f..dbc18a2 100644 --- a/src/main/java/fr/klemek/mapping/Map.java +++ b/src/main/java/fr/klemek/mapping/Map.java @@ -83,7 +83,7 @@ class Map { for (int y = 0; y < newSize; y++) { if (x < this.m.length && y < this.m.length) tm[x][y] = this.m[x][y]; - if (x < this.m2.length && y < this.m2.length) + if (x < this.m2.length && y < this.m2.length && x < tm2.length && y < tm2.length) tm2[x][y] = this.m2[x][y]; } this.m = tm;