diff --git a/BankEconomyMod/bin/me/kaZep/Base/Main.class b/BankEconomyMod/bin/me/kaZep/Base/Main.class index 3eb7f28..8dcf318 100644 Binary files a/BankEconomyMod/bin/me/kaZep/Base/Main.class and b/BankEconomyMod/bin/me/kaZep/Base/Main.class differ diff --git a/BankEconomyMod/bin/me/kaZep/Base/PlayerListener$1.class b/BankEconomyMod/bin/me/kaZep/Base/PlayerListener$1.class index df67888..6ae96e9 100644 Binary files a/BankEconomyMod/bin/me/kaZep/Base/PlayerListener$1.class and b/BankEconomyMod/bin/me/kaZep/Base/PlayerListener$1.class differ diff --git a/BankEconomyMod/bin/me/kaZep/Base/PlayerListener$2.class b/BankEconomyMod/bin/me/kaZep/Base/PlayerListener$2.class index cb1a6cd..accf046 100644 Binary files a/BankEconomyMod/bin/me/kaZep/Base/PlayerListener$2.class and b/BankEconomyMod/bin/me/kaZep/Base/PlayerListener$2.class differ diff --git a/BankEconomyMod/bin/me/kaZep/Base/PlayerListener$3.class b/BankEconomyMod/bin/me/kaZep/Base/PlayerListener$3.class index 40dd461..0554928 100644 Binary files a/BankEconomyMod/bin/me/kaZep/Base/PlayerListener$3.class and b/BankEconomyMod/bin/me/kaZep/Base/PlayerListener$3.class differ diff --git a/BankEconomyMod/bin/me/kaZep/Base/PlayerListener$4.class b/BankEconomyMod/bin/me/kaZep/Base/PlayerListener$4.class index 0089be5..4ec5b57 100644 Binary files a/BankEconomyMod/bin/me/kaZep/Base/PlayerListener$4.class and b/BankEconomyMod/bin/me/kaZep/Base/PlayerListener$4.class differ diff --git a/BankEconomyMod/bin/me/kaZep/Base/PlayerListener$5.class b/BankEconomyMod/bin/me/kaZep/Base/PlayerListener$5.class index dc698b9..903361b 100644 Binary files a/BankEconomyMod/bin/me/kaZep/Base/PlayerListener$5.class and b/BankEconomyMod/bin/me/kaZep/Base/PlayerListener$5.class differ diff --git a/BankEconomyMod/bin/me/kaZep/Base/PlayerListener$6.class b/BankEconomyMod/bin/me/kaZep/Base/PlayerListener$6.class index dd60fd1..5da6746 100644 Binary files a/BankEconomyMod/bin/me/kaZep/Base/PlayerListener$6.class and b/BankEconomyMod/bin/me/kaZep/Base/PlayerListener$6.class differ diff --git a/BankEconomyMod/bin/me/kaZep/Base/PlayerListener.class b/BankEconomyMod/bin/me/kaZep/Base/PlayerListener.class index a525c4f..307e7e5 100644 Binary files a/BankEconomyMod/bin/me/kaZep/Base/PlayerListener.class and b/BankEconomyMod/bin/me/kaZep/Base/PlayerListener.class differ diff --git a/BankEconomyMod/bin/me/kaZep/Commands/commandBankEconomy.class b/BankEconomyMod/bin/me/kaZep/Commands/commandBankEconomy.class index a4fa21e..ef15564 100644 Binary files a/BankEconomyMod/bin/me/kaZep/Commands/commandBankEconomy.class and b/BankEconomyMod/bin/me/kaZep/Commands/commandBankEconomy.class differ diff --git a/BankEconomyMod/src/me/kaZep/Base/Main.java b/BankEconomyMod/src/me/kaZep/Base/Main.java index 5e35e63..2599c2c 100644 --- a/BankEconomyMod/src/me/kaZep/Base/Main.java +++ b/BankEconomyMod/src/me/kaZep/Base/Main.java @@ -452,16 +452,16 @@ public class Main extends JavaPlugin Farmer_job.addData("CACTUS", 0.00, 3, 0); Farmer_job.addData("BROWN MUSHROOM", 0.00, 3, 0); Farmer_job.addData("RED MUSHROOM", 0.00, 3, 0); - Farmer_job.addData("WHEAT", 0.01, 2, 0); - Farmer_job.addData("CARROT", 0.01, 2, 0); - Farmer_job.addData("POTATO", 0.03, 3, 0); - Farmer_job.addData("NETHER WART", 0.03, 3, 0); + Farmer_job.addData("WHEAT", 0.005, 2, 0); + Farmer_job.addData("CARROT", 0.005, 2, 0); + Farmer_job.addData("POTATO", 0.015, 3, 0); + Farmer_job.addData("NETHER WART", 0.015, 3, 0); //Farmer_job.addData("PUMPKIN SEEDS", 0.02, 4, 0); //Farmer_job.addData("PUMPKIN", 0.04, 8, 0); - Farmer_job.addData("MELON", 0.10, 10, 0); - Farmer_job.addData("SEEDS", 0.005, 1, 1); - Farmer_job.addData("PUMPKIN SEEDS", 0.01, 2, 1); - Farmer_job.addData("MELON SEEDS", 0.01, 2, 1); + Farmer_job.addData("MELON", 0.05, 10, 0); + Farmer_job.addData("SEEDS", 0.0025, 1, 1); + Farmer_job.addData("PUMPKIN SEEDS", 0.005, 2, 1); + Farmer_job.addData("MELON SEEDS", 0.005, 2, 1); //Farmer_job.addData("PUMPKIN", 0.00, -16, 1); Farmer_job.setBuffData("Hoes do not lose durability when used.", "Killing skeletons yields triple the amount of bones.", @@ -3137,6 +3137,26 @@ public void payDay(int time) } return count; } + + public void setUltimate(Player p, String job) { + boolean valid=false; + int matchedjob=0; + for (int i=0;i=40) { + //Allow this teleport. + e.setTo(new Location(Bukkit.getWorld("world"),-8990,68,-4)); + } else { + e.setCancelled(true); + } + } + } + } @EventHandler public void onPlayerInteract(PlayerInteractEntityEvent ev) { @@ -2722,13 +2755,13 @@ public class PlayerListener this.plugin.gainMoneyExp(p,"Farmer",0.03,3); } if (e.getBlock().getType()==Material.BROWN_MUSHROOM) { - this.plugin.gainMoneyExp(p,"Farmer",0.00,1); + this.plugin.gainMoneyExp(p,"Farmer",0.00,3); } if (e.getBlock().getType()==Material.RED_MUSHROOM) { - this.plugin.gainMoneyExp(p,"Farmer",0.00,1); + this.plugin.gainMoneyExp(p,"Farmer",0.00,3); } if (e.getBlock().getType()==Material.NETHER_WARTS && e.getBlock().getData()==3) { - this.plugin.gainMoneyExp(p,"Farmer",0.00,1); + this.plugin.gainMoneyExp(p,"Farmer",0.03,3); } /*if (e.getBlock().getType()==Material.PUMPKIN) { this.plugin.gainMoneyExp(p,"Farmer",0.00,1); diff --git a/BankEconomyMod/src/me/kaZep/Commands/commandBankEconomy.java b/BankEconomyMod/src/me/kaZep/Commands/commandBankEconomy.java index c7f10a1..87f9444 100644 --- a/BankEconomyMod/src/me/kaZep/Commands/commandBankEconomy.java +++ b/BankEconomyMod/src/me/kaZep/Commands/commandBankEconomy.java @@ -716,6 +716,10 @@ public class commandBankEconomy if (cmd.getName().equalsIgnoreCase("jobs") && args.length == 1 && args[0].equalsIgnoreCase("buffs")) { p.sendMessage("Usage: "+ChatColor.GREEN+"/jobs buffs [JobName]"+ChatColor.WHITE+" - Get buffs information about a job. Type /jobs to see the jobs."); } else + if (cmd.getName().equalsIgnoreCase("jobs") && args.length == 2 && args[0].equalsIgnoreCase("ultimate")) { + //Attempt to join the job. + this.plugin.setUltimate(p,args[1]); + } else if (cmd.getName().equalsIgnoreCase("jobs") && args.length == 2 && args[0].equalsIgnoreCase("join")) { //Attempt to join the job. this.plugin.joinJob(p,args[1]);