Fix /dt clear on not Detonator items #259
@ -89,19 +89,19 @@ public class CommandDetonator extends SWCommand {
|
|||||||
@Register("clear")
|
@Register("clear")
|
||||||
public void clearCommand(Player p) {
|
public void clearCommand(Player p) {
|
||||||
if (!permissionCheck(p)) return;
|
if (!permissionCheck(p)) return;
|
||||||
p.getInventory().setItemInMainHand(Detonator.clearDetonator(p.getInventory().getItemInMainHand()));
|
Detonator.clear(p);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Register("delete")
|
@Register("delete")
|
||||||
public void deleteCommand(Player p) {
|
public void deleteCommand(Player p) {
|
||||||
if (!permissionCheck(p)) return;
|
if (!permissionCheck(p)) return;
|
||||||
p.getInventory().setItemInMainHand(Detonator.clearDetonator(p.getInventory().getItemInMainHand()));
|
Detonator.clear(p);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Register("reset")
|
@Register("reset")
|
||||||
public void resetCommand(Player p) {
|
public void resetCommand(Player p) {
|
||||||
if (!permissionCheck(p)) return;
|
if (!permissionCheck(p)) return;
|
||||||
p.getInventory().setItemInMainHand(Detonator.clearDetonator(p.getInventory().getItemInMainHand()));
|
Detonator.clear(p);
|
||||||
}
|
}
|
||||||
|
|
||||||
private boolean permissionCheck(Player player) {
|
private boolean permissionCheck(Player player) {
|
||||||
|
@ -239,6 +239,16 @@ public class Detonator implements Listener {
|
|||||||
return item;
|
return item;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public static void clear(Player player) {
|
||||||
|
VersionedRunnable.call(new VersionedRunnable(() -> PLAYER_LOCS.computeIfAbsent(player, player1 -> new HashSet<>()).clear(), 12), new VersionedRunnable(() -> {
|
||||||
|
if (player.getInventory().getItemInMainHand().getItemMeta().getPersistentDataContainer().has(new NamespacedKey(BauSystem.getPlugin(), "deto"), PersistentDataType.BYTE)) {
|
||||||
|
player.sendMessage(BauSystem.PREFIX + "§cDu hast keinen Detonator im Inventar");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
player.getInventory().setItemInMainHand(clearDetonator(player.getInventory().getItemInMainHand()));
|
||||||
|
}, 15));
|
||||||
|
}
|
||||||
|
|
||||||
public static ItemStack clearDetonator(ItemStack item) {
|
public static ItemStack clearDetonator(ItemStack item) {
|
||||||
ItemMeta meta = item.getItemMeta();
|
ItemMeta meta = item.getItemMeta();
|
||||||
PersistentDataContainer container = meta.getPersistentDataContainer();
|
PersistentDataContainer container = meta.getPersistentDataContainer();
|
||||||
|
In neuem Issue referenzieren
Einen Benutzer sperren