Upstream/ImageOnMap
1
0
Fork 0
mirror of https://github.com/zDevelopers/ImageOnMap.git synced 2025-02-21 13:51:22 +01:00
Code Issues Projects Releases Wiki Activity

Merge pull request #185 from zDevelopers/fix/glow_xp_bug

Browse Source 
Unlimited xp issue with glow effect
This commit is contained in:
Vlammar 2021-05-30 18:09:09 +02:00 committed by GitHub
commit 20d2a60d29
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/fr/moribus/imageonmap/ui/MapItemManager.java
View File

@ -37,12 +37,14 @@
package fr.moribus.imageonmap.ui; package fr.moribus.imageonmap.ui;
import fr.moribus.imageonmap.Permissions; import fr.moribus.imageonmap.Permissions;
import fr.moribus.imageonmap.PluginConfiguration;
import fr.moribus.imageonmap.map.ImageMap; import fr.moribus.imageonmap.map.ImageMap;
import fr.moribus.imageonmap.map.MapManager; import fr.moribus.imageonmap.map.MapManager;
import fr.moribus.imageonmap.map.PosterMap; import fr.moribus.imageonmap.map.PosterMap;
import fr.moribus.imageonmap.map.SingleMap; import fr.moribus.imageonmap.map.SingleMap;
import fr.zcraft.quartzlib.components.i18n.I; import fr.zcraft.quartzlib.components.i18n.I;
import fr.zcraft.quartzlib.core.QuartzLib; import fr.zcraft.quartzlib.core.QuartzLib;
import fr.zcraft.quartzlib.tools.PluginLogger;
import fr.zcraft.quartzlib.tools.items.ItemStackBuilder; import fr.zcraft.quartzlib.tools.items.ItemStackBuilder;
import fr.zcraft.quartzlib.tools.items.ItemUtils; import fr.zcraft.quartzlib.tools.items.ItemUtils;
import fr.zcraft.quartzlib.tools.runners.RunTask; import fr.zcraft.quartzlib.tools.runners.RunTask;
@ -260,7 +262,6 @@ public class MapItemManager implements Listener {
frame.setItem(new ItemStack(Material.AIR)); frame.setItem(new ItemStack(Material.AIR));
if (SplatterMapManager.hasSplatterAttributes(mapItem)) { if (SplatterMapManager.hasSplatterAttributes(mapItem)) {
if (!SplatterMapManager.placeSplatterMap(frame, player, event)) { if (!SplatterMapManager.placeSplatterMap(frame, player, event)) {
event.setCancelled(true); //In case of an error allow to cancel map placement event.setCancelled(true); //In case of an error allow to cancel map placement
return; return;

22
src/main/java/fr/moribus/imageonmap/ui/SplatterMapManager.java
View File

@ -44,9 +44,9 @@ import fr.moribus.imageonmap.map.PosterMap;
import fr.zcraft.quartzlib.components.i18n.I; import fr.zcraft.quartzlib.components.i18n.I;
import fr.zcraft.quartzlib.components.nbt.NBT; import fr.zcraft.quartzlib.components.nbt.NBT;
import fr.zcraft.quartzlib.components.nbt.NBTCompound; import fr.zcraft.quartzlib.components.nbt.NBTCompound;
import fr.zcraft.quartzlib.components.nbt.NBTException;
import fr.zcraft.quartzlib.components.nbt.NBTList; import fr.zcraft.quartzlib.components.nbt.NBTList;
import fr.zcraft.quartzlib.tools.PluginLogger; import fr.zcraft.quartzlib.tools.PluginLogger;
import fr.zcraft.quartzlib.tools.items.GlowEffect;
import fr.zcraft.quartzlib.tools.items.ItemStackBuilder; import fr.zcraft.quartzlib.tools.items.ItemStackBuilder;
import fr.zcraft.quartzlib.tools.reflection.NMSException; import fr.zcraft.quartzlib.tools.reflection.NMSException;
import fr.zcraft.quartzlib.tools.runners.RunTask; import fr.zcraft.quartzlib.tools.runners.RunTask;
@ -125,22 +125,8 @@ public abstract class SplatterMapManager {
* @return The modified item stack. The instance may be different if the passed item stack is not a craft itemstack. * @return The modified item stack. The instance may be different if the passed item stack is not a craft itemstack.
*/ */
public static ItemStack addSplatterAttribute(final ItemStack itemStack) { public static ItemStack addSplatterAttribute(final ItemStack itemStack) {
try { GlowEffect.addGlow(itemStack);
final NBTCompound nbt = NBT.fromItemStack(itemStack); return itemStack;
final NBTList enchantments = new NBTList();
final NBTCompound protection = new NBTCompound();
protection.put("id", "minecraft:mending");
protection.put("lvl", 1);
enchantments.add(protection);
nbt.put("Enchantments", enchantments);
return NBT.addToItemStack(itemStack, nbt, false);
} catch (NBTException | NMSException e) {
PluginLogger.error("Unable to set Splatter Map attribute on item", e);
return itemStack;
}
} }
/** /**
@ -185,7 +171,7 @@ public abstract class SplatterMapManager {
* Return true if it has a specified splatter map * Return true if it has a specified splatter map
* *
* @param player The player to check. * @param player The player to check.
* @param map The map to check. * @param map The map to check.
* @return True if the player has this map * @return True if the player has this map
*/ */
public static boolean hasSplatterMap(Player player, PosterMap map) { public static boolean hasSplatterMap(Player player, PosterMap map) {