Merge pull request #5 from kicjow/kicjow-patch-1

Kicjow patch 1
This commit is contained in:
BadBones69 2016-11-14 18:28:49 -05:00 committed by GitHub
commit ac23825caf
4 changed files with 13 additions and 6 deletions

View File

@ -26,6 +26,7 @@ import org.bukkit.plugin.Plugin;
import me.badbones69.crazyauctions.currency.CM;
public class Api {
public static Plugin plugin = Bukkit.getServer().getPluginManager().getPlugin("CrazyAuctions");
public static String color(String msg){
@ -442,4 +443,4 @@ public class Api {
return NumberFormat.getNumberInstance().format(price);
}
}
}

View File

@ -47,4 +47,5 @@ public class CrazyAuctions {
}
return items;
}
}
}

View File

@ -279,6 +279,7 @@ public class Main extends JavaPlugin implements Listener{
sender.sendMessage(Api.getPrefix()+Api.color("/CA Help"));
return false;
}
@EventHandler
public void onJoin(PlayerJoinEvent e){
final Player player = e.getPlayer();
@ -295,7 +296,8 @@ public class Main extends JavaPlugin implements Listener{
}
}, 40);
}
void startCheck(){
private void startCheck(){
Bukkit.getScheduler().scheduleSyncRepeatingTask(this, new Runnable(){
@Override
public void run() {
@ -303,7 +305,8 @@ public class Main extends JavaPlugin implements Listener{
}
}, 20, 5*20);
}
ArrayList<Material> getDamageableItems(){
private ArrayList<Material> getDamageableItems(){
ArrayList<Material> ma = new ArrayList<Material>();
ma.add(Material.DIAMOND_HELMET);
ma.add(Material.DIAMOND_CHESTPLATE);
@ -355,4 +358,5 @@ public class Main extends JavaPlugin implements Listener{
ma.add(Material.FISHING_ROD);
return ma;
}
}
}

View File

@ -32,4 +32,5 @@ public enum Shop{
}
return null;
}
}
}