From 70ead1efe1c032a1c1ae99b8b884adaa1b3a5273 Mon Sep 17 00:00:00 2001 From: Garbage Mule Date: Tue, 27 Sep 2011 20:19:53 +0200 Subject: [PATCH] Fixed MagicSpells mumbo jumbo. No more pre v1.1! --- MobArena.jar | Bin 231585 -> 231482 bytes resources/plugin.yml | 2 +- src/com/garbagemule/MobArena/MobArena.java | 7 +- .../listeners/MagicSpellsListener.java | 4 +- .../listeners/MagicSpellsOldListener.java | 62 ++++++++++++++++++ 5 files changed, 66 insertions(+), 9 deletions(-) create mode 100644 src/com/garbagemule/MobArena/listeners/MagicSpellsOldListener.java diff --git a/MobArena.jar b/MobArena.jar index 8af743e307c88ffceb5f69a814d94c460ef6728a..8c684ebd122fdd7c6db1c7c02e6ef05fe0cb4116 100644 GIT binary patch delta 11706 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 diff --git a/resources/plugin.yml b/resources/plugin.yml index b178fb5..adf23a2 100644 --- a/resources/plugin.yml +++ b/resources/plugin.yml @@ -1,6 +1,6 @@ name: MobArena main: com.garbagemule.MobArena.MobArena -version: 0.94.3.5 +version: 0.94.3.6 softdepend: [Spout,Permissions,MultiVerse,XcraftGate,Towny,Heroes,MagicSpells] commands: ma: diff --git a/src/com/garbagemule/MobArena/MobArena.java b/src/com/garbagemule/MobArena/MobArena.java index 0bf3dc6..7f4af56 100644 --- a/src/com/garbagemule/MobArena/MobArena.java +++ b/src/com/garbagemule/MobArena/MobArena.java @@ -16,7 +16,6 @@ import org.bukkit.plugin.java.JavaPlugin; import org.bukkit.plugin.PluginManager; import org.bukkit.util.config.Configuration; -import com.garbagemule.MobArena.listeners.MagicSpellsBetaListener; import com.garbagemule.MobArena.listeners.MagicSpellsListener; import com.garbagemule.MobArena.spout.Spouty; import com.garbagemule.MobArena.util.FileUtils; @@ -199,11 +198,7 @@ public class MobArena extends JavaPlugin PluginManager pm = getServer().getPluginManager(); - // Check the version, and make the correct listener. Deprecate as soon as 1.1 is out of beta. - if (spells.getDescription().getVersion().equals("1.1")) - pm.registerEvent(Event.Type.CUSTOM_EVENT, new MagicSpellsBetaListener(this), Priority.Normal, this); - else - pm.registerEvent(Event.Type.CUSTOM_EVENT, new MagicSpellsListener(this), Priority.Normal, this); + pm.registerEvent(Event.Type.CUSTOM_EVENT, new MagicSpellsListener(this), Priority.Normal, this); } public Configuration getConfig() { return config; } diff --git a/src/com/garbagemule/MobArena/listeners/MagicSpellsListener.java b/src/com/garbagemule/MobArena/listeners/MagicSpellsListener.java index ba868ba..8adfc88 100644 --- a/src/com/garbagemule/MobArena/listeners/MagicSpellsListener.java +++ b/src/com/garbagemule/MobArena/listeners/MagicSpellsListener.java @@ -10,8 +10,8 @@ import com.garbagemule.MobArena.Arena; import com.garbagemule.MobArena.MobArena; import com.garbagemule.MobArena.util.FileUtils; import com.garbagemule.MobArena.waves.Wave.WaveType; -import com.nisovin.MagicSpells.Events.SpellCastEvent; -import com.nisovin.MagicSpells.Events.SpellListener; +import com.nisovin.magicspells.events.SpellCastEvent; +import com.nisovin.magicspells.events.SpellListener; public class MagicSpellsListener extends SpellListener { diff --git a/src/com/garbagemule/MobArena/listeners/MagicSpellsOldListener.java b/src/com/garbagemule/MobArena/listeners/MagicSpellsOldListener.java new file mode 100644 index 0000000..1ee7944 --- /dev/null +++ b/src/com/garbagemule/MobArena/listeners/MagicSpellsOldListener.java @@ -0,0 +1,62 @@ +package com.garbagemule.MobArena.listeners; + +import java.io.File; +import java.util.LinkedList; +import java.util.List; + +import org.bukkit.util.config.Configuration; + +import com.garbagemule.MobArena.Arena; +import com.garbagemule.MobArena.MobArena; +import com.garbagemule.MobArena.util.FileUtils; +import com.garbagemule.MobArena.waves.Wave.WaveType; +import com.nisovin.MagicSpells.Events.SpellCastEvent; +import com.nisovin.MagicSpells.Events.SpellListener; + +public class MagicSpellsOldListener extends SpellListener +{ + private MobArena plugin; + private List disabled, disabledOnBoss, disabledOnSwarm; + + public MagicSpellsOldListener(MobArena plugin) + { + this.plugin = plugin; + + // Set up the MagicSpells config-file. + File spellFile = FileUtils.extractFile(plugin.getDataFolder(), "magicspells.yml"); + Configuration spellConfig = new Configuration(spellFile); + spellConfig.load(); + setupSpells(spellConfig); + } + + public void onSpellCast(SpellCastEvent event) + { + Arena arena = plugin.getAM().getArenaWithPlayer(event.getCaster()); + if (arena == null || !arena.isRunning()) return; + + String spell = event.getSpell().getName(); + WaveType type = (arena.getWave() != null) ? arena.getWave().getType() : null; + + if (disabled.contains(spell) || + (type == WaveType.BOSS && disabledOnBoss.contains(spell)) || + (type == WaveType.SWARM && disabledOnSwarm.contains(spell))) + event.setCancelled(true); + } + + private void setupSpells(Configuration config) + { + this.disabled = config.getStringList("disabled-spells", new LinkedList()); + this.disabledOnBoss = config.getStringList("disabled-only-on-bosses", new LinkedList()); + this.disabledOnSwarm = config.getStringList("disabled-only-on-swarms", new LinkedList()); + } + + public void disableSpell(String spell) + { + disabled.add(spell); + } + + public void disableSpellOnBoss(String spell) + { + disabledOnBoss.add(spell); + } +}