From a41ffaedee2a3459bc5c4cc4d70216c1837ae4ce Mon Sep 17 00:00:00 2001 From: Vlammar Date: Thu, 30 Jul 2020 13:37:06 +0200 Subject: [PATCH] fixed other bugs linked to #121 --- .../java/fr/moribus/imageonmap/gui/MapDetailGui.java | 2 +- src/main/java/fr/moribus/imageonmap/gui/MapListGui.java | 2 +- .../java/fr/moribus/imageonmap/ui/MapItemManager.java | 9 +++++---- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/src/main/java/fr/moribus/imageonmap/gui/MapDetailGui.java b/src/main/java/fr/moribus/imageonmap/gui/MapDetailGui.java index 465508e..9717771 100644 --- a/src/main/java/fr/moribus/imageonmap/gui/MapDetailGui.java +++ b/src/main/java/fr/moribus/imageonmap/gui/MapDetailGui.java @@ -102,7 +102,7 @@ public class MapDetailGui extends ExplorerGui if (map instanceof SingleMap) { - return MapItemManager.createMapItem((SingleMap)map); + return MapItemManager.createMapItem((SingleMap)map,true); } else if (map instanceof PosterMap) { diff --git a/src/main/java/fr/moribus/imageonmap/gui/MapListGui.java b/src/main/java/fr/moribus/imageonmap/gui/MapListGui.java index 8d8053d..40f38d9 100644 --- a/src/main/java/fr/moribus/imageonmap/gui/MapListGui.java +++ b/src/main/java/fr/moribus/imageonmap/gui/MapListGui.java @@ -131,7 +131,7 @@ public class MapListGui extends ExplorerGui if (map instanceof SingleMap) { - return MapItemManager.createMapItem(map.getMapsIDs()[0], map.getName(), false); + return MapItemManager.createMapItem(map.getMapsIDs()[0], map.getName(), false,true); } else if (map instanceof PosterMap) { diff --git a/src/main/java/fr/moribus/imageonmap/ui/MapItemManager.java b/src/main/java/fr/moribus/imageonmap/ui/MapItemManager.java index 7c60c76..3ce3bf5 100644 --- a/src/main/java/fr/moribus/imageonmap/ui/MapItemManager.java +++ b/src/main/java/fr/moribus/imageonmap/ui/MapItemManager.java @@ -43,10 +43,10 @@ import fr.moribus.imageonmap.map.PosterMap; import fr.moribus.imageonmap.map.SingleMap; import fr.zcraft.zlib.components.i18n.I; import fr.zcraft.zlib.core.ZLib; -import fr.zcraft.zlib.tools.PluginLogger; import fr.zcraft.zlib.tools.items.ItemStackBuilder; import fr.zcraft.zlib.tools.items.ItemUtils; import org.bukkit.*; +import org.bukkit.block.BlockFace; import org.bukkit.entity.ItemFrame; import org.bukkit.entity.Player; import org.bukkit.event.EventHandler; @@ -190,7 +190,6 @@ public class MapItemManager implements Listener meta.setMapId(mapID); meta.setColor(isMapPart ? Color.LIME : Color.GREEN); mapItem.setItemMeta(meta); - PluginLogger.info("color "+meta.getColor()); return mapItem; } static public ItemStack createMapItem(int mapID, String text, boolean isMapPart) @@ -271,11 +270,13 @@ public class MapItemManager implements Listener event.setCancelled(true); //In case of an error allow to cancel map placement return; } - frame.setRotation(Rotation.NONE.rotateCounterClockwise()); + if(frame.getFacing()!= BlockFace.UP&&frame.getFacing()!= BlockFace.DOWN) + frame.setRotation(Rotation.NONE.rotateCounterClockwise()); } else { - frame.setRotation(Rotation.NONE.rotateCounterClockwise()); + if(frame.getFacing()!= BlockFace.UP&&frame.getFacing()!= BlockFace.DOWN) + frame.setRotation(Rotation.NONE.rotateCounterClockwise()); // If the item has a display name, bot not one from an anvil by the player, we remove it // If it is not displayed on hover on the wall. if (mapItem.hasItemMeta() && mapItem.getItemMeta().hasDisplayName() && mapItem.getItemMeta().getDisplayName().startsWith("ยง6"))