diff --git a/BankEconomyMod/bin/me/kaZep/Base/Main$1.class b/BankEconomyMod/bin/me/kaZep/Base/Main$1.class index 46339d8..3c81c0a 100644 Binary files a/BankEconomyMod/bin/me/kaZep/Base/Main$1.class and b/BankEconomyMod/bin/me/kaZep/Base/Main$1.class differ diff --git a/BankEconomyMod/bin/me/kaZep/Base/PlayerListener$6.class b/BankEconomyMod/bin/me/kaZep/Base/PlayerListener$6.class index 3ffde4b..3988a53 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 e1dc200..b3b18bf 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 c37a92e..55d7ddb 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 f95e8a7..fda2576 100644 --- a/BankEconomyMod/src/me/kaZep/Base/Main.java +++ b/BankEconomyMod/src/me/kaZep/Base/Main.java @@ -1569,7 +1569,7 @@ public void runTick() { } if (doit) { //Bukkit.getPlayer("sigonasr2").sendMessage("Charge Zombie!"); - if (l.getCustomName().compareTo(ChatColor.DARK_PURPLE+"Charge Zombie III")==0) { + if (l.getCustomName().compareTo(ChatColor.DARK_PURPLE+"Charge Zombie III")==0 && !l.isDead()) { /*//OLD CHARGE ZOMBIE BEHAVIOR. Charge Zombie II now does this weak block destruction. for (int k=-1;k<2;k++) { for (int j=-1;j<2;j++) { diff --git a/BankEconomyMod/src/me/kaZep/Base/PlayerListener.java b/BankEconomyMod/src/me/kaZep/Base/PlayerListener.java index 7c01e6e..215f318 100644 --- a/BankEconomyMod/src/me/kaZep/Base/PlayerListener.java +++ b/BankEconomyMod/src/me/kaZep/Base/PlayerListener.java @@ -6217,6 +6217,7 @@ public ItemStack getGoodie() { eve.data2=p.getLevel(); eve.expiretime=Bukkit.getWorld("world").getFullTime()+1200; this.plugin.explorers.add(eve); + if (!survivor) { Bukkit.getScheduler().scheduleSyncDelayedTask(this.plugin, new Runnable() { @Override public void run() { @@ -6225,11 +6226,13 @@ public ItemStack getGoodie() { } } },1); + } } } //e.getCause()==DamageCause. final double player_starthp = p.getHealth(); if (p.getNoDamageTicks()=0.5) { p.sendMessage(ChatColor.DARK_PURPLE+""+ChatColor.ITALIC+"Took "+df.format(player_starthp-p.getHealth())+" damage from "+ChatColor.WHITE+f.getCause().toString()+ChatColor.DARK_PURPLE+""+ChatColor.ITALIC+" (-"+df2.format(((player_starthp-p.getHealth())/p.getMaxHealth())*100)+"%)"); } - if (p.getHealth()<=0) { - FatalSurvivor(p); - } + if (plugin.PlayerinJob(p, "Explorer")) { + if (plugin.getJobLv("Explorer", p)>=10) { + //Check to see if our "fatal s urvivor" effect is available. + boolean survivor=false; + for (int i=0;i=10) { + //Check to see if our "fatal s urvivor" effect is available. + boolean survivor=false; + for (int i=0;i=10) { + //Check to see if our "fatal s urvivor" effect is available. + boolean survivor=false; + for (int i=0;i0) { @@ -7029,7 +7095,35 @@ public ItemStack getGoodie() { } } else { e.setDamage(0); - FatalSurvivor(p); //Player died. Instead run fatal survivor. + final Player p2 = p; + if (plugin.PlayerinJob(p, "Explorer")) { + if (plugin.getJobLv("Explorer", p)>=10) { + //Check to see if our "fatal s urvivor" effect is available. + boolean survivor=false; + for (int i=0;i=10) { + //Check to see if our "fatal s urvivor" effect is available. + boolean survivor=false; + for (int i=0;i0) { @@ -7073,7 +7195,35 @@ public ItemStack getGoodie() { } } else { e.setDamage(0); - FatalSurvivor(p); //Player died. Instead run fatal survivor. + final Player p2 = p; + if (plugin.PlayerinJob(p, "Explorer")) { + if (plugin.getJobLv("Explorer", p)>=10) { + //Check to see if our "fatal s urvivor" effect is available. + boolean survivor=false; + for (int i=0;i=5?"+Lv5 Buff":"")+ChatColor.GREEN+(mylv>=10?" +Lv10 Buff":"")+ChatColor.GOLD+(mylv>=20?" +Lv20 Buff":"")); + p.sendMessage("Lv"+mylv+" "+this.plugin.getJobColor(joblist[i])+joblist[i]+ChatColor.WHITE+": "+Math.round(this.plugin.getAccountsConfig().getInt(Bukkit.getPlayer(args[1]).getName()+".jobs.job"+(i+1)+"exp"))+"xp "+ChatColor.BLUE+(mylv>=5?"+Lv5 Buff":"")+ChatColor.GREEN+(mylv>=10?" +Lv10 Buff":"")+ChatColor.GOLD+(mylv>=20?" +Lv20 Buff":"")); } else { - p.sendMessage("Lv"+mylv+" "+this.plugin.getJobColor(joblist[i])+joblist[i]+ChatColor.WHITE+": "+Math.round(this.plugin.getAccountsConfig().getInt(p.getServer().getPlayer(args[1]).getName()+".jobs.job"+(i+1)+"exp"))+"/"+Math.round(this.plugin.getJobExp(joblist[i], this.plugin.getAccountsConfig().getInt(p.getServer().getPlayer(args[1]).getName()+".jobs.job"+(i+1)+"lv")))+"xp "+ChatColor.BLUE+(mylv>=5?"+Lv5 Buff":"")+ChatColor.GREEN+(mylv>=10?" +Lv10 Buff":"")+ChatColor.GOLD+(mylv>=20?" +Lv20 Buff":"")); + p.sendMessage("Lv"+mylv+" "+this.plugin.getJobColor(joblist[i])+joblist[i]+ChatColor.WHITE+": "+Math.round(this.plugin.getAccountsConfig().getInt(Bukkit.getPlayer(args[1]).getName()+".jobs.job"+(i+1)+"exp"))+"/"+Math.round(this.plugin.getJobExp(joblist[i], this.plugin.getAccountsConfig().getInt(Bukkit.getPlayer(args[1]).getName()+".jobs.job"+(i+1)+"lv")))+"xp "+ChatColor.BLUE+(mylv>=5?"+Lv5 Buff":"")+ChatColor.GREEN+(mylv>=10?" +Lv10 Buff":"")+ChatColor.GOLD+(mylv>=20?" +Lv20 Buff":"")); } - if (joblist[i].equalsIgnoreCase("Explorer") && this.plugin.getJobLv(joblist[i], p.getServer().getPlayer(args[1]))>=10) { + if (joblist[i].equalsIgnoreCase("Explorer") && this.plugin.getJobLv(joblist[i], Bukkit.getPlayer(args[1]))>=10) { //Check to see if the buff is on cooldown for this player or not. boolean discovered=false; long timeleft=0; for (int j=0;j