Compiled against CB1113

This commit is contained in:
Garbage Mule
2011-09-15 07:35:46 +02:00
parent 6291a0fbfb
commit a0b489f11b
3 changed files with 5 additions and 3 deletions
BIN
View File
Binary file not shown.
@@ -442,6 +442,8 @@ public class MAListener implements ArenaListener
if (!(event.getEntity() instanceof Player) || !arena.arenaPlayers.contains((Player)event.getEntity())) if (!(event.getEntity() instanceof Player) || !arena.arenaPlayers.contains((Player)event.getEntity()))
return; return;
System.out.println(event.getRegainReason());
if (event.getRegainReason() == RegainReason.REGEN) if (event.getRegainReason() == RegainReason.REGEN)
event.setCancelled(true); event.setCancelled(true);
} }
+3 -3
View File
@@ -72,7 +72,7 @@ public class MobArena extends JavaPlugin
setupRegister(); setupRegister();
setupSpout(); setupSpout();
setupHeroes(); setupHeroes();
setupMagicSpells(); //setupMagicSpells();
// Set up the ArenaMaster and the announcements // Set up the ArenaMaster and the announcements
am = new ArenaMaster(this); am = new ArenaMaster(this);
@@ -189,7 +189,7 @@ public class MobArena extends JavaPlugin
heroManager = ((Heroes) heroes).getHeroManager(); heroManager = ((Heroes) heroes).getHeroManager();
} }
private void setupMagicSpells() /*private void setupMagicSpells()
{ {
Plugin spells = this.getServer().getPluginManager().getPlugin("MagicSpells"); Plugin spells = this.getServer().getPluginManager().getPlugin("MagicSpells");
if (spells == null) return; if (spells == null) return;
@@ -197,7 +197,7 @@ public class MobArena extends JavaPlugin
PluginManager pm = getServer().getPluginManager(); PluginManager pm = getServer().getPluginManager();
MagicSpellsListener spellsListener = new MagicSpellsListener(this); MagicSpellsListener spellsListener = new MagicSpellsListener(this);
pm.registerEvent(Event.Type.CUSTOM_EVENT, spellsListener, Priority.Normal, this); pm.registerEvent(Event.Type.CUSTOM_EVENT, spellsListener, Priority.Normal, this);
} }*/
public Configuration getConfig() { return config; } public Configuration getConfig() { return config; }
public ArenaMaster getAM() { return am; } // More convenient. public ArenaMaster getAM() { return am; } // More convenient.