Avoid using entity.getLocation as much since it makes use of defensive copying

Use utility from AccessibleObject for reflection to reduce necessary checks.

Give ReflectionHelper some new tools.

Change the area specification options on the AreaEffectSpell to accept doubles instead of ints.
Changed max-distance in PulserSpell to accept a double instead of an integer for better control.
Changed retarget-reange and target-range in SpawnMonsterSpell to accept doubles instead of ints for better control.
Changed radius in ForcebombSpell to accept a double for better control.
Changed bounce-range in ChainSpell to a double for better control.
Changed range in RoarSpell to a double for better control.
Changed max-range in RecallSpell to a double for better control.
Changed range in PurgeSpell to a double for better control.

[WIP] Started a framework for command argument processing.
[WIP] template for reset spell

CRITICAL
introduced new option for the general config: ignore-grant-perms-fake-value
This defaults to true for avoiding changes in behavior. However, it is HIGHLY recommended to set this to false.

Author: TheComputerGeek2

src/com/nisovin/magicspells/MagicSpells.java

@@ -105,6 +105,7 @@ public class MagicSpells extends JavaPlugin {
 	boolean opsHaveAllSpells;
 	boolean defaultAllPermsFalse;
 	boolean ignoreGrantPerms;
+	boolean ignoreGrantPermsFakeValue;
 	boolean ignoreCastPerms;
 
 	boolean enableTempGrantPerms = true;
@@ -297,6 +298,7 @@ void load() {
 		opsHaveAllSpells = config.getBoolean("general.ops-have-all-spells", true);
 		defaultAllPermsFalse = config.getBoolean("general.default-all-perms-false", false);
 		ignoreGrantPerms = config.getBoolean("general.ignore-grant-perms", false);
+		ignoreGrantPermsFakeValue = config.getBoolean("general.ignore-grant-perms-fake-value", true);
 		ignoreCastPerms = config.getBoolean("general.ignore-cast-perms", false);
 		enableTempGrantPerms = config.getBoolean("general.enable-tempgrant-perms", true);
 

src/com/nisovin/magicspells/Spellbook.java

@@ -100,7 +100,7 @@ public void load(World playerWorld) {
 		loadFromFile(playerWorld);
 
 		// Give all spells to ops, or if ignoring grant perms
-		if (plugin.ignoreGrantPerms || (player.isOp() && plugin.opsHaveAllSpells)) {
+		if ((plugin.ignoreGrantPerms && plugin.ignoreGrantPermsFakeValue) || (player.isOp() && plugin.opsHaveAllSpells)) {
 			MagicSpells.debug(2, "  Op, granting all spells...");
 			for (Spell spell : plugin.spellsOrdered) {
 				if (spell.isHelperSpell()) continue;
@@ -398,10 +398,10 @@ public boolean hasSpell(Spell spell) {
 
 	// DEBUG INFO: level 2, adding granted spell for player, spell
 	public boolean hasSpell(Spell spell, boolean checkGranted) {
-		if (plugin.ignoreGrantPerms) return true;
+		if (plugin.ignoreGrantPerms && plugin.ignoreGrantPermsFakeValue) return true;
 		boolean has = allSpells.contains(spell);
 		if (has) return true;
-		if (checkGranted && Perm.GRANT.has(player, spell)) {
+		if (checkGranted && !plugin.ignoreGrantPerms && Perm.GRANT.has(player, spell)) {
 			MagicSpells.debug(2, "Adding granted spell for " + player.getName() + ": " + spell.getName());
 			addSpell(spell);
 			save();

src/com/nisovin/magicspells/exception/MagicException.java

@@ -0,0 +1,9 @@
+package com.nisovin.magicspells.exception;
+
+public class MagicException extends Exception {
+
+	public MagicException(String message) {
+		super(message);
+	}
+	
+}

src/com/nisovin/magicspells/spells/command/ResetSpell.java

@@ -0,0 +1,51 @@
+package com.nisovin.magicspells.spells.command;
+
+import com.nisovin.magicspells.spells.CommandSpell;
+import com.nisovin.magicspells.util.MagicConfig;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+
+import java.util.List;
+
+// PLANNED OPTIONS
+// get spellbook(s)
+//     remove certain spells
+//     remove all spells
+//     remove bindings
+// variables
+//     remove certain variables
+//     remove all variables
+// MarkSpell
+//     remove certain
+//     remove all
+// KeybindSpell
+//     reset
+
+// Spellbook spells
+//     remove by player/world/all
+public class ResetSpell extends CommandSpell {
+	
+	public ResetSpell(MagicConfig config, String spellName) {
+		super(config, spellName);
+	}
+	
+	@Override
+	public boolean castFromConsole(CommandSender sender, String[] args) {
+		return false;
+	}
+	
+	@Override
+	public PostCastAction castSpell(Player player, SpellCastState state, float power, String[] args) {
+		// get player(s)
+		
+		return null;
+	}
+	
+	@Override
+	public List<String> tabComplete(CommandSender sender, String partial) {
+		return null;
+	}
+	
+	
+	
+}

src/com/nisovin/magicspells/spells/instant/ParticleProjectileSpell.java

@@ -193,6 +193,7 @@ public ProjectileTracker(Player caster, Location from, float power) {
 				this.startLocation.setY(this.startLocation.getY() + ParticleProjectileSpell.this.startYOffset);
 			}
 			if (ParticleProjectileSpell.this.startForwardOffset != 0) {
+				// TODO see what can be cleaned up here with constructing locations and vectors
 				this.startLocation.add(this.startLocation.getDirection().clone().multiply(ParticleProjectileSpell.this.startForwardOffset));
 			}
 			this.previousLocation = this.startLocation.clone();

src/com/nisovin/magicspells/spells/instant/ProjectileSpell.java

@@ -420,7 +420,7 @@ private class ProjectileInfo {
 
 		public ProjectileInfo(Player player, float power) {
 			this.player = player;
-			this.start = player.getLocation().clone();
+			this.start = player.getLocation();
 			this.power = power;
 			this.done = false;
 			this.monitor = null;

src/com/nisovin/magicspells/spells/instant/PurgeSpell.java

@@ -21,13 +21,13 @@
 
 public class PurgeSpell extends InstantSpell implements TargetedLocationSpell {
 
-	private int radius;
+	private double radius;
 	private List<EntityType> entities;
 
 	public PurgeSpell(MagicConfig config, String spellName) {
 		super(config, spellName);
 
-		this.radius = getConfigInt("range", 15);
+		this.radius = getConfigDouble("range", 15);
 
 		List<String> list = getConfigStringList("entities", null);
 		if (list != null && !list.isEmpty()) {
@@ -47,7 +47,7 @@ public PurgeSpell(MagicConfig config, String spellName) {
 	@Override
 	public PostCastAction castSpell(Player player, SpellCastState state, float power, String[] args) {
 		if (state == SpellCastState.NORMAL) {
-			int castingRange = Math.round(this.radius * power);
+			double castingRange = this.radius * power;
 			List<Entity> entitiesNearby = player.getNearbyEntities(castingRange, castingRange, castingRange);
 			boolean killed = false;
 			for (Entity entity : entitiesNearby) {

src/com/nisovin/magicspells/spells/instant/RecallSpell.java

@@ -18,7 +18,7 @@ public class RecallSpell extends InstantSpell implements TargetedEntitySpell {
 
 	private String markSpellName;
 	private boolean allowCrossWorld;
-	private int maxRange;
+	private double maxRange;
 	private boolean useBedLocation;
 	private String strNoMark;
 	private String strOtherWorld;
@@ -32,7 +32,7 @@ public RecallSpell(MagicConfig config, String spellName) {
 
 		this.markSpellName = getConfigString("mark-spell", "mark");
 		this.allowCrossWorld = getConfigBoolean("allow-cross-world", true);
-		this.maxRange = getConfigInt("max-range", 0);
+		this.maxRange = getConfigDouble("max-range", 0);
 		this.useBedLocation = getConfigBoolean("use-bed-location", false);
 		this.strNoMark = getConfigString("str-no-mark", "You have no mark to recall to.");
 		this.strOtherWorld = getConfigString("str-other-world", "Your mark is in another world.");

src/com/nisovin/magicspells/spells/instant/RitualSpell.java

@@ -128,15 +128,15 @@ public ActiveRitual(Player caster, float power, String[] args) {
 			this.power = power;
 			this.args = args;
 			this.caster = caster;
-			this.channelers.put(caster, caster.getLocation().clone());
+			this.channelers.put(caster, caster.getLocation());
 			this.taskId = Bukkit.getScheduler().scheduleSyncRepeatingTask(MagicSpells.plugin, this, tickInterval, tickInterval);
 			if (showProgressOnExpBar) MagicSpells.getExpBarManager().lock(caster, this);
 			playSpellEffects(EffectPosition.CASTER, caster);
 		}
 
 		public void addChanneler(Player player) {
 			if (this.channelers.containsKey(player)) return;
-			this.channelers.put(player, player.getLocation().clone());
+			this.channelers.put(player, player.getLocation());
 			if (showProgressOnExpBar) MagicSpells.getExpBarManager().lock(player, this);
 			playSpellEffects(EffectPosition.CASTER, player);
 		}

src/com/nisovin/magicspells/spells/instant/RoarSpell.java

@@ -13,14 +13,14 @@
 
 public class RoarSpell extends InstantSpell {
 
-	private int radius;
+	private double radius;
 	private boolean cancelIfNoTargets;
 	private String strNoTarget;
 
 	public RoarSpell(MagicConfig config, String spellName) {
 		super(config, spellName);
 
-		this.radius = getConfigInt("range", 8);
+		this.radius = getConfigDouble("range", 8);
 		this.cancelIfNoTargets = getConfigBoolean("cancel-if-no-targets", true);
 		this.strNoTarget = getConfigString("str-no-target", "No targets found.");
 	}