Remove ant files

This commit is contained in:
aPunch 2012-03-20 20:29:06 -05:00
parent e5bbe641ed
commit 46810ddf0e
6 changed files with 15 additions and 4 deletions

View File

@ -1,12 +1,12 @@
eclipse.preferences.version=1 eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5 org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
org.eclipse.jdt.core.compiler.compliance=1.5 org.eclipse.jdt.core.compiler.compliance=1.6
org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.lineNumber=generate
org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate
org.eclipse.jdt.core.compiler.debug.sourceFile=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
org.eclipse.jdt.core.compiler.source=1.5 org.eclipse.jdt.core.compiler.source=1.6

Binary file not shown.

Binary file not shown.

Binary file not shown.

View File

@ -183,7 +183,6 @@ public class Blacksmith extends Character {
reforge = player.getItemInHand(); reforge = player.getItemInHand();
} }
@Override
public void run() { public void run() {
npc.chat(player, reforgeItemInHand() ? successMsg : failMsg); npc.chat(player, reforgeItemInHand() ? successMsg : failMsg);
if (npc.getBukkitEntity() instanceof Player) if (npc.getBukkitEntity() instanceof Player)

View File

@ -13,6 +13,7 @@ import net.milkbowl.vault.economy.Economy;
import org.bukkit.enchantments.Enchantment; import org.bukkit.enchantments.Enchantment;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.ItemStack;
import org.bukkit.plugin.Plugin;
import org.bukkit.plugin.RegisteredServiceProvider; import org.bukkit.plugin.RegisteredServiceProvider;
import org.bukkit.plugin.java.JavaPlugin; import org.bukkit.plugin.java.JavaPlugin;
@ -37,6 +38,17 @@ public class BlacksmithPlugin extends JavaPlugin {
Economy.class); Economy.class);
if (economyProvider != null) if (economyProvider != null)
economy = economyProvider.getProvider(); economy = economyProvider.getProvider();
else {
// Disable if no economy plugin was found
final Plugin plugin = this;
getServer().getScheduler().scheduleSyncDelayedTask(plugin, new Runnable() {
public void run() {
getServer().getLogger().log(Level.SEVERE, "Failed to load an economy plugin. Disabling...");
getServer().getPluginManager().disablePlugin(plugin);
}
});
}
CitizensAPI.getCharacterManager().registerCharacter( CitizensAPI.getCharacterManager().registerCharacter(
new CharacterFactory(Blacksmith.class).withName("blacksmith")); new CharacterFactory(Blacksmith.class).withName("blacksmith"));