diff --git a/pom.xml b/pom.xml
index f4772ef..c9177b8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -39,7 +39,7 @@
4.0.0
fr.moribus
ImageOnMap
- 4.1.2
+ 4.2.0
jar
diff --git a/src/main/java/fr/moribus/imageonmap/commands/maptool/NewCommand.java b/src/main/java/fr/moribus/imageonmap/commands/maptool/NewCommand.java
index a4acdc6..8fe0389 100644
--- a/src/main/java/fr/moribus/imageonmap/commands/maptool/NewCommand.java
+++ b/src/main/java/fr/moribus/imageonmap/commands/maptool/NewCommand.java
@@ -121,7 +121,7 @@ public class NewCommand extends IoMCommand {
}
scaling = resizeMode();
}
- if (width == 0 || height == 0) {
+ if (width < 0 || height < 0) {
throwInvalidArgument(I.t("You need to specify a valid size. e.g. resize 4 5"));
return;
}
diff --git a/src/main/java/fr/moribus/imageonmap/gui/MapDetailGui.java b/src/main/java/fr/moribus/imageonmap/gui/MapDetailGui.java
index 52a2095..9ec4686 100644
--- a/src/main/java/fr/moribus/imageonmap/gui/MapDetailGui.java
+++ b/src/main/java/fr/moribus/imageonmap/gui/MapDetailGui.java
@@ -46,6 +46,7 @@ import fr.zcraft.quartzlib.components.gui.Gui;
import fr.zcraft.quartzlib.components.gui.GuiAction;
import fr.zcraft.quartzlib.components.gui.PromptGui;
import fr.zcraft.quartzlib.components.i18n.I;
+import fr.zcraft.quartzlib.tools.PluginLogger;
import fr.zcraft.quartzlib.tools.items.ItemStackBuilder;
import fr.zcraft.quartzlib.tools.runners.RunTask;
import org.apache.commons.lang.ArrayUtils;
@@ -208,32 +209,35 @@ public class MapDetailGui extends ExplorerGui {
return;
}
- PromptGui.prompt(getPlayer(), newName -> {
- if (!Permissions.RENAME.grantedTo(getPlayer())) {
- I.sendT(getPlayer(), "{ce}You are no longer allowed to do that.");
- return;
- }
+ try {
+ PromptGui.prompt(getPlayer(), newName -> {
+ if (!Permissions.RENAME.grantedTo(getPlayer())) {
+ I.sendT(getPlayer(), "{ce}You are no longer allowed to do that.");
+ return;
+ }
- if (newName == null || newName.isEmpty()) {
- I.sendT(getPlayer(), "{ce}Map names can't be empty.");
- return;
- }
- if (newName.equals(map.getName())) {
- return;
- }
+ if (newName == null || newName.isEmpty()) {
+ I.sendT(getPlayer(), "{ce}Map names can't be empty.");
+ return;
+ }
+ if (newName.equals(map.getName())) {
+ return;
+ }
- map.rename(newName);
- I.sendT(getPlayer(), "{cs}Map successfully renamed.");
+ map.rename(newName);
+ I.sendT(getPlayer(), "{cs}Map successfully renamed.");
- if (getParent() != null) {
- RunTask.later(() -> Gui.open(getPlayer(), this), 1L);
-
- } else {
- close();
- }
- }, map.getName(), this);
+ if (getParent() != null) {
+ RunTask.later(() -> Gui.open(getPlayer(), this), 1L);
+ } else {
+ close();
+ }
+ }, map.getName(), this);
+ } catch (IllegalStateException e) {
+ PluginLogger.info("error while renaming");
+ }
}
@GuiAction("delete")
diff --git a/src/main/java/fr/moribus/imageonmap/ui/SplatterMapManager.java b/src/main/java/fr/moribus/imageonmap/ui/SplatterMapManager.java
index 922fabe..3efc07c 100644
--- a/src/main/java/fr/moribus/imageonmap/ui/SplatterMapManager.java
+++ b/src/main/java/fr/moribus/imageonmap/ui/SplatterMapManager.java
@@ -137,6 +137,7 @@ public abstract class SplatterMapManager {
* @return True if the attribute was detected.
*/
public static boolean hasSplatterAttributes(ItemStack itemStack) {
+
try {
final NBTCompound nbt = NBT.fromItemStack(itemStack);
if (!nbt.containsKey("Enchantments")) {
diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml
index f2ee1dd..785d785 100644
--- a/src/main/resources/plugin.yml
+++ b/src/main/resources/plugin.yml
@@ -1,6 +1,6 @@
name: ImageOnMap
main: fr.moribus.imageonmap.ImageOnMap
-version: "4.1.2"
+version: "4.2.0"
api-version: "1.13"