Brewer job buffs + The start of new mobs.

dev
sigonasr2 11 years ago
parent 762b127548
commit 9d6428d58e
  1. 18
      BankEconomyMod/src/me/kaZep/Base/Main.java
  2. 3
      BankEconomyMod/src/me/kaZep/Base/PlayerBuffData.java
  3. 1
      BankEconomyMod/src/me/kaZep/Base/PlayerData.java
  4. 2078
      BankEconomyMod/src/me/kaZep/Base/PlayerListener.java
  5. 12
      BankEconomyMod/src/me/kaZep/Base/TempBlock.java

@ -1123,10 +1123,10 @@ public class Main extends JavaPlugin
Brewer_job.addData("GHAST TEAR", 0.30, 20, 0); Brewer_job.addData("GHAST TEAR", 0.30, 20, 0);
Brewer_job.setBuffData("Gain access to the Teleport potion. Water Bottle + Lapis Lazuli. Throwing it will teleport you to the thrown location.", Brewer_job.setBuffData("Gain access to the Teleport potion. Water Bottle + Lapis Lazuli. Throwing it will teleport you to the thrown location.",
"Potions can stack up to 2 at a time. Gain access to the Eye of Wonder potion. Teleport potion + Eye of Ender. Drinking it will reveal mobs' nametags nearby. Throwing it will turn stone into glass temporarily, revealing nearby ores within.", "Potions can stack up to 2 at a time. Gain access to the Eye of Wonder potion. Teleport potion + Eye of Ender. Drinking it will reveal mobs' nametags nearby. Throwing it will turn stone into glass temporarily, revealing nearby ores within.",
"Potions you throw have double the duration. Gain access to the Potion of Fury (Gives you attack speed. Strength Potion + Blaze Rod) and Potion of Resistance (Heal Potion + Obsidian) Potions.", "Potions you throw have double the duration. Potions can stack up to 4 at a time. The stacking amount goes up by 1 with each Brewer level after 20.",
"Gain the ability to create Strength potions with Strength IV buffs. Heal potions created by you heal 4x their normal amount.", "Gain the ability to create Strength potions with Strength IV buffs. Heal potions created by you heal 4x their normal amount.",
"Potions can stack up to 8 at a time. Gain the ability to brew Night Vision and Invisibility potions.", "Gain access to the Potion of Fury (Gives you attack speed. Strength Potion + Blaze Rod) and Potion of Resistance (Heal Potion + Obsidian) Potions.",
"Potions created by you last for 30 minutes. Potions can stack up to 64 at a time. Brewing wait time decreased by 4x the normal time."); "Potions thrown by you last for 30 minutes. Potions can stack up to 64 at a time. Brewing wait time decreased by 4x the normal time.");
Enchanter_job.setJobName("Enchanter"); Enchanter_job.setJobName("Enchanter");
Enchanter_job.setJobDescription("An enchanter's job is to enchant items in order to make them more powerful and useful for everyday tasks."); Enchanter_job.setJobDescription("An enchanter's job is to enchant items in order to make them more powerful and useful for everyday tasks.");
@ -2676,6 +2676,14 @@ public void checkJukeboxes() {
LOGGING_UPDATE_COUNTS++; //2 LOGGING_UPDATE_COUNTS++; //2
Player[] list = Bukkit.getOnlinePlayers(); Player[] list = Bukkit.getOnlinePlayers();
for (int i=0;i<list.length;i++) { for (int i=0;i<list.length;i++) {
if (getPlayerData(list[i]).furytime!=0 && Main.SERVER_TICK_TIME>getPlayerData(list[i]).furytime) {
getPlayerData(list[i]).furytime=0;
list[i].sendMessage(ChatColor.RED+""+ChatColor.ITALIC+"Fury Potion effect has worn off...");
}
if (getPlayerData(list[i]).invulntime!=0 && Main.SERVER_TICK_TIME>getPlayerData(list[i]).invulntime) {
getPlayerData(list[i]).invulntime=0;
list[i].sendMessage(ChatColor.RED+""+ChatColor.ITALIC+"Invulnerability Potion effect has worn off...");
}
if (hasJobBuff("Hunter", list[i],Job.JOB40)) { if (hasJobBuff("Hunter", list[i],Job.JOB40)) {
if (Bukkit.getWorld("world").getTime()>13000) { if (Bukkit.getWorld("world").getTime()>13000) {
list[i].addPotionEffect(new PotionEffect(PotionEffectType.INVISIBILITY,200,1,true)); list[i].addPotionEffect(new PotionEffect(PotionEffectType.INVISIBILITY,200,1,true));
@ -3333,6 +3341,10 @@ public void updateTime() {
//Bukkit.getPlayer("sigonasr2").sendMessage("Brewing stand. "+brewingstandlist.get(i).getBrewingTime()); //Bukkit.getPlayer("sigonasr2").sendMessage("Brewing stand. "+brewingstandlist.get(i).getBrewingTime());
if (brewingstandlist.get(i).getBrewingTime()>0 && !brewingstandlist.get(i).is_newTimeSet()) { if (brewingstandlist.get(i).getBrewingTime()>0 && !brewingstandlist.get(i).is_newTimeSet()) {
//Bukkit.getPlayer("sigonasr2").sendMessage("Brewing, time is not set: "+brewingstandlist.get(i).getBrewingTime()); //Bukkit.getPlayer("sigonasr2").sendMessage("Brewing, time is not set: "+brewingstandlist.get(i).getBrewingTime());
if (hasJobBuff("Brewer", brewingstandlist.get(i).owner, Job.JOB40)) {
brewingstandlist.get(i).set_newTime(true);
brewingstandlist.get(i).setBrewingTime(brewingstandlist.get(i).getBrewingTime()/4);
}
if (PlayerinJob(brewingstandlist.get(i).owner, "Brewer") && getJobLv("Brewer", brewingstandlist.get(i).owner)>=5) { if (PlayerinJob(brewingstandlist.get(i).owner, "Brewer") && getJobLv("Brewer", brewingstandlist.get(i).owner)>=5) {
brewingstandlist.get(i).set_newTime(true); brewingstandlist.get(i).set_newTime(true);
//Bukkit.getPlayer("sigonasr2").sendMessage("Old Brewing time: "+brewingstandlist.get(i).getBrewingTime()); //Bukkit.getPlayer("sigonasr2").sendMessage("Old Brewing time: "+brewingstandlist.get(i).getBrewingTime());

@ -243,12 +243,13 @@ public class PlayerBuffData {
//Figure out potion effects when player joins. //Figure out potion effects when player joins.
while (effects.hasNext()) { while (effects.hasNext()) {
PotionEffect nexteffect = effects.next(); PotionEffect nexteffect = effects.next();
/*
if (nexteffect.getType().getName().compareTo(PotionEffectType.INCREASE_DAMAGE.getName())==0) { if (nexteffect.getType().getName().compareTo(PotionEffectType.INCREASE_DAMAGE.getName())==0) {
if (nexteffect.getAmplifier()>0) { if (nexteffect.getAmplifier()>0) {
p.removePotionEffect(PotionEffectType.INCREASE_DAMAGE); p.removePotionEffect(PotionEffectType.INCREASE_DAMAGE);
p.addPotionEffect(new PotionEffect(PotionEffectType.INCREASE_DAMAGE,nexteffect.getDuration()*4,0)); p.addPotionEffect(new PotionEffect(PotionEffectType.INCREASE_DAMAGE,nexteffect.getDuration()*4,0));
} }
} }*/
if (nexteffect.getType().getName().compareTo(PotionEffectType.SPEED.getName())==0) { if (nexteffect.getType().getName().compareTo(PotionEffectType.SPEED.getName())==0) {
if (nexteffect.getDuration()<47479999) { if (nexteffect.getDuration()<47479999) {
//This is not a buff we applied via our plugin. //This is not a buff we applied via our plugin.

@ -13,6 +13,7 @@ public class PlayerData {
long lastsneaktime=0; long lastsneaktime=0;
int minestreak=0; int minestreak=0;
long furytime=0; long furytime=0;
long invulntime=0;
int furyamt=0; int furyamt=0;
boolean haslanded=true; boolean haslanded=true;
long lasteattime=Main.SERVER_TICK_TIME; long lasteattime=Main.SERVER_TICK_TIME;

File diff suppressed because it is too large Load Diff

@ -0,0 +1,12 @@
package me.kaZep.Base;
import org.bukkit.Location;
public class TempBlock {
public Location loc;
public int timer;
public TempBlock(Location loc, int timer) {
this.loc=loc;
this.timer=timer;
}
}
Loading…
Cancel
Save