Upstream
/
DungeonsXL
mirror of https://github.com/DRE2N/DungeonsXL.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix dungeon item version scope

This commit is contained in:
Daniel Saukel 2021-07-04 17:14:32 +02:00
parent 5862dd9dff
commit a139f6647d
2 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
core/src/main/java/de/erethon/dungeonsxl/DungeonsXL.java
View File

@ -106,7 +106,6 @@ import org.bukkit.event.HandlerList;
import org.bukkit.inventory.Inventory; import org.bukkit.inventory.Inventory;
import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.ItemStack;
import org.bukkit.inventory.meta.ItemMeta; import org.bukkit.inventory.meta.ItemMeta;
import org.bukkit.persistence.PersistentDataContainer;
import org.bukkit.persistence.PersistentDataType; import org.bukkit.persistence.PersistentDataType;
import org.bukkit.scheduler.BukkitRunnable; import org.bukkit.scheduler.BukkitRunnable;
@ -789,7 +788,7 @@ public class DungeonsXL extends DREPlugin implements DungeonsAPI {
@Override @Override
public boolean isDungeonItem(ItemStack itemStack) { public boolean isDungeonItem(ItemStack itemStack) {
if (!de.erethon.commons.compatibility.Version.isAtLeast(de.erethon.commons.compatibility.Version.MC1_13)) { if (!Version.isAtLeast(Version.MC1_16_5)) {
return false; return false;
} }
if (itemStack == null || !itemStack.hasItemMeta()) { if (itemStack == null || !itemStack.hasItemMeta()) {
@ -800,9 +799,20 @@ public class DungeonsXL extends DREPlugin implements DungeonsAPI {
@Override @Override
public ItemStack setDungeonItem(ItemStack itemStack, boolean dungeonItem) { public ItemStack setDungeonItem(ItemStack itemStack, boolean dungeonItem) {
if (!Version.isAtLeast(Version.MC1_16_5)) {
return null;
}
if (itemStack == null || !itemStack.hasItemMeta()) {
return null;
}
ItemStack dIStack = itemStack.clone(); ItemStack dIStack = itemStack.clone();
ItemMeta meta = dIStack.getItemMeta(); ItemMeta meta = dIStack.getItemMeta();
meta.getPersistentDataContainer().set(NamespacedKey.fromString("dungeon_item", this), PersistentDataType.BYTE, (byte) 1); NamespacedKey key = NamespacedKey.fromString("dungeon_item", this);
if (dungeonItem) {
meta.getPersistentDataContainer().set(key, PersistentDataType.BYTE, (byte) 1);
} else {
meta.getPersistentDataContainer().remove(key);
}
dIStack.setItemMeta(meta); dIStack.setItemMeta(meta);
return dIStack; return dIStack;
} }

2
core/src/main/java/de/erethon/dungeonsxl/command/DCommandCache.java
View File

@ -101,7 +101,7 @@ public class DCommandCache extends DRECommandCache {
addCommand(breakCmd); addCommand(breakCmd);
addCommand(create); addCommand(create);
addCommand(delete); addCommand(delete);
if (Version.isAtLeast(Version.MC1_13)) { if (Version.isAtLeast(Version.MC1_16_5)) {
addCommand(dungeonItem); addCommand(dungeonItem);
} }
addCommand(edit); addCommand(edit);