Skip to content

Check for spell ownership first #1012

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 2 commits into from
Apr 5, 2025
Merged

Check for spell ownership first #1012

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7326237
Check for spell ownership first
TonytheMacaroni Apr 5, 2025
39c6f6a
Add str-cant-cast-by-command
TonytheMacaroni Apr 5, 2025
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
6 changes: 6 additions & 0 deletions core/src/main/java/com/nisovin/magicspells/Spell.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,6 +165,7 @@ public abstract class Spell implements Comparable<Spell>, Listener {
protected String strWrongCastItem;
protected String strModifierFailed;
protected String strMissingReagents;
protected String strCantCastByCommand;

protected ModifierSet modifiers;
protected ModifierSet targetModifiers;
Expand Down Expand Up @@ -436,6 +437,7 @@ public Spell(MagicConfig config, String spellName) {
strWrongCastItem = config.getString(internalKey + "str-wrong-cast-item", strCantCast);
strModifierFailed = config.getString(internalKey + "str-modifier-failed", null);
strMissingReagents = config.getString(internalKey + "str-missing-reagents", MagicSpells.getMissingReagentsMessage());
strCantCastByCommand = config.getString(internalKey + "str-cant-cast-by-command", "You cannot cast this spell by commands.");
if (strXpAutoLearned != null) strXpAutoLearned = strXpAutoLearned.replace("%s", name);

tags = new HashSet<>(config.getStringList(internalKey + "tags", new ArrayList<>()));
Expand Down Expand Up @@ -2492,6 +2494,10 @@ public String getStrWrongCastItem() {
return strWrongCastItem;
}

public String getStrCantCastByCommand() {
return strCantCastByCommand;
}

public List<String> getPrecludes() {
return precludes;
}
Expand Down
15 changes: 8 additions & 7 deletions core/src/main/java/com/nisovin/magicspells/commands/MagicCommand.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -741,21 +741,22 @@ public void onCastSelf(CommandIssuer issuer, String[] args) {
return;
}
// Player
if (sender instanceof Player) {
Player player = ((Player) sender).getPlayer();
if (player == null) return;
if (!spell.canCastByCommand()) {
MagicSpells.sendMessage(MagicSpells.getTextColor() + "You cannot cast this spell by commands.", player, null);
return;
}
if (sender instanceof Player player) {
if (spell.isHelperSpell() && !Perm.COMMAND_CAST_SELF_HELPER.has(player) || !MagicSpells.getSpellbook(player).hasSpell(spell)) {
MagicSpells.sendMessage(MagicSpells.getTextColor() + MagicSpells.getUnknownSpellMessage(), player, null);
return;
}

if (!spell.canCastByCommand()) {
MagicSpells.sendMessage(MagicSpells.getTextColor() + spell.getStrCantCastByCommand(), player, null);
return;
}

if (!spell.isValidItemForCastCommand(player.getInventory().getItemInMainHand())) {
MagicSpells.sendMessage(spell.getStrWrongCastItem(), player, null);
return;
}

spell.hardCast(new SpellData(player, power, spellArgs));
return;
}
Expand Down