Skip to content

Revert part of ffbe97c642 #1109

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
TonytheMacaroni merged 1 commit into from
Oct 5, 2026
Merged

Revert part of ffbe97c642 #1109

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 5 additions & 8 deletions core/src/main/java/com/nisovin/magicspells/spelleffects/effecttypes/ItemCooldownEffect.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package com.nisovin.magicspells.spelleffects.effecttypes;

import org.bukkit.Material;
import org.bukkit.NamespacedKey;
import org.bukkit.entity.Entity;
import org.bukkit.entity.Player;
Expand All @@ -10,21 +11,19 @@
import com.nisovin.magicspells.util.SpellData;
import com.nisovin.magicspells.util.config.ConfigData;
import com.nisovin.magicspells.spelleffects.SpellEffect;
import com.nisovin.magicspells.util.magicitems.MagicItem;
import com.nisovin.magicspells.util.config.ConfigDataUtil;
import com.nisovin.magicspells.util.magicitems.MagicItems;

@Name("itemcooldown")
public class ItemCooldownEffect extends SpellEffect {

private ConfigData<String> item;
private ConfigData<Material> item;
private ConfigData<Integer> duration;
private ConfigData<NamespacedKey> key;

@Override
protected void loadFromConfig(ConfigurationSection config) {
item = ConfigDataUtil.getString(config, "item", "stone");
key = ConfigDataUtil.getNamespacedKey(config, "key", null);
item = ConfigDataUtil.getMaterial(config, "item", Material.STONE);
duration = ConfigDataUtil.getInteger(config, "duration", TimeUtil.TICKS_PER_SECOND);
}

Expand All @@ -35,10 +34,8 @@ protected Runnable playEffectEntity(Entity entity, SpellData data) {
int duration = this.duration.get(data);

NamespacedKey key = this.key.get(data);
if (key == null) {
MagicItem item = MagicItems.getMagicItemFromString(this.item.get(data));
if (item != null) player.setCooldown(item.getItemStack(), duration);
} else player.setCooldown(key, duration);
if (key == null) player.setCooldown(item.get(data), duration);
else player.setCooldown(key, duration);

return null;
}
Expand Down
Loading