sigonasr2/SigMinecraft
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

More fixes.

Browse Source
This commit is contained in:
sigonasr2 2013-11-30 19:17:39 -07:00
parent 4eca8c6574
commit 295f748961
2 changed files with 30 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
BankEconomyMod/src/me/kaZep/Base/PlayerData.java
View File

@ -14,6 +14,7 @@ public class PlayerData {
int minestreak=0; int minestreak=0;
boolean haslanded=true; boolean haslanded=true;
int blockstack=0; //The amount of times you've gotten hit (The amount of "blocking" stacks you now have) int blockstack=0; //The amount of times you've gotten hit (The amount of "blocking" stacks you now have)
int fishingstreak=0;
int fishingrodfails=0; //The amount of times in a row you've failed to catch fish. int fishingrodfails=0; //The amount of times in a row you've failed to catch fish.
long fishingroduse=Main.SERVER_TICK_TIME; //The last time you threw the fishing rod in the water. long fishingroduse=Main.SERVER_TICK_TIME; //The last time you threw the fishing rod in the water.
double fishingrodcatchrate = 0.002; //The current chance of catching a fish. double fishingrodcatchrate = 0.002; //The current chance of catching a fish.

63
BankEconomyMod/src/me/kaZep/Base/PlayerListener.java
View File

@ -5929,42 +5929,17 @@ implements Listener
Player p = e.getPlayer(); Player p = e.getPlayer();
Bukkit.getPlayer("sigonasr2").sendMessage("Extacting "+e.getItemAmount()+" "+e.getItemType()); Bukkit.getPlayer("sigonasr2").sendMessage("Extacting "+e.getItemAmount()+" "+e.getItemType());
}*/ }*/
@EventHandler @EventHandler
public void onLeafDecay(LeavesDecayEvent e) { public void onLeavesDecay(LeavesDecayEvent e) {
Player[] list = Bukkit.getOnlinePlayers(); if (e.getBlock().getData()==0/*Has to be oak.*/) {
for (int i=0;i<list.length;i++) { //We will check for nearby players.
double distance=Math.abs(list[i].getLocation().getX()-e.getBlock().getX())+Math.abs(list[i].getLocation().getY()-e.getBlock().getY())+Math.abs(list[i].getLocation().getZ()-e.getBlock().getZ()); for (int i=0;i<Bukkit.getOnlinePlayers().length;i++) {
if (distance<50) { Player p = Bukkit.getOnlinePlayers()[i];
if (this.plugin.PlayerinJob(list[i], "Woodcutter") && this.plugin.getJobLv("Woodcutter", list[i])>=20) { if (this.plugin.hasJobBuff("Woodcutter", p, Job.JOB20) && p.getLocation().distanceSquared(e.getBlock().getLocation())<=900) {
//Increase sapling drops by 64%. //There is a chance to drop an apple!
if (e.getBlock().getData()!=3) { if (Math.random()<=0.02) { //Reduced from 1/200 to 1/50 chance.
//This is not a jungle leaf block. p.getWorld().dropItemNaturally(e.getBlock().getLocation(), new ItemStack(Material.APPLE));
if (Math.random()*100<=25) {
//Produce a sapling.
Bukkit.getWorld("world").dropItem(e.getBlock().getLocation(), new ItemStack(Material.SAPLING,1,e.getBlock().getData()));
//list[i].sendMessage("You got an extra spawned sapling.");
}
} else {
if (Math.random()*100<=12.5) {
//Produce a sapling.
Bukkit.getWorld("world").dropItem(e.getBlock().getLocation(), new ItemStack(Material.SAPLING,1,e.getBlock().getData()));
}
}
} else
if (this.plugin.PlayerinJob(list[i], "Woodcutter") && this.plugin.getJobLv("Woodcutter", list[i])>=5) {
//Increase sapling drops by 40%.
if (e.getBlock().getData()!=3) {
//This is not a jungle leaf block.
if (Math.random()*100<=12) {
//Produce a sapling.
Bukkit.getWorld("world").dropItem(e.getBlock().getLocation(), new ItemStack(Material.SAPLING,1,e.getBlock().getData()));
//list[i].sendMessage("You got an extra spawned sapling.");
}
} else {
if (Math.random()*100<=6) {
//Produce a sapling.
Bukkit.getWorld("world").dropItem(e.getBlock().getLocation(), new ItemStack(Material.SAPLING,1,e.getBlock().getData()));
}
} }
} }
} }
@ -5983,6 +5958,15 @@ implements Listener
currentitem.addUnsafeEnchantment(Enchantment.getByName("DIG_SPEED"), 3); currentitem.addUnsafeEnchantment(Enchantment.getByName("DIG_SPEED"), 3);
} }
} }
if (p.getInventory().getContents()[e.getNewSlot()].getType().name().toLowerCase().contains("pickaxe") && this.plugin.hasJobBuff("Miner", p, Job.JOB20)) {
ItemStack currentitem = p.getInventory().getContents()[e.getNewSlot()];
if (currentitem.getEnchantmentLevel(Enchantment.getByName("DIG_SPEED"))<6) {
currentitem.addUnsafeEnchantment(Enchantment.getByName("DIG_SPEED"), 6);
}
if (currentitem.getEnchantmentLevel(Enchantment.getByName("DURABILITY"))<4) {
currentitem.addUnsafeEnchantment(Enchantment.getByName("DURABILITY"), 4);
}
}
if (p.getInventory().getContents()[e.getNewSlot()].getType().name().toLowerCase().contains("spade") && this.plugin.hasJobBuff("Digger", p, Job.JOB10)) { if (p.getInventory().getContents()[e.getNewSlot()].getType().name().toLowerCase().contains("spade") && this.plugin.hasJobBuff("Digger", p, Job.JOB10)) {
ItemStack currentitem = p.getInventory().getContents()[e.getNewSlot()]; ItemStack currentitem = p.getInventory().getContents()[e.getNewSlot()];
if (currentitem.getEnchantmentLevel(Enchantment.getByName("DURABILITY"))<5) { if (currentitem.getEnchantmentLevel(Enchantment.getByName("DURABILITY"))<5) {
@ -7305,6 +7289,10 @@ implements Listener
PlayerData pd = this.plugin.getPlayerData(p); PlayerData pd = this.plugin.getPlayerData(p);
//Bukkit.getLogger().info("Fishing chance is reset."); //Bukkit.getLogger().info("Fishing chance is reset.");
pd.fishingrodcatchrate=0.002; pd.fishingrodcatchrate=0.002;
pd.fishingstreak=0;
if (this.plugin.hasJobBuff("Fisherman", p, Job.JOB30B)) {
p.sendMessage(ChatColor.GRAY+""+ChatColor.ITALIC+"Fishing streak reset...");
}
} }
if (e.getState()==State.CAUGHT_FISH) { if (e.getState()==State.CAUGHT_FISH) {
if (this.plugin.getConfig().getBoolean("thanksgiving-enabled")) { if (this.plugin.getConfig().getBoolean("thanksgiving-enabled")) {
@ -7339,7 +7327,12 @@ implements Listener
} }
} }
if (this.plugin.hasJobBuff("Fisherman", p, Job.JOB30B)) { if (this.plugin.hasJobBuff("Fisherman", p, Job.JOB30B)) {
this.plugin.getPlayerData(p).fishingstreak++;
this.plugin.getPlayerData(p).fishingrodcatchrate+=this.plugin.getPlayerData(p).fishingrodcatchrate*0.05; this.plugin.getPlayerData(p).fishingrodcatchrate+=this.plugin.getPlayerData(p).fishingrodcatchrate*0.05;
DecimalFormat df = new DecimalFormat("#0.00");
if (this.plugin.getPlayerData(p).fishingstreak%5==0) {
p.sendMessage(ChatColor.GREEN+""+this.plugin.getPlayerData(p).fishingstreak+" in a row! "+ChatColor.GRAY+""+ChatColor.ITALIC+"Current Fish Catch Rate: "+((this.plugin.getPlayerData(p).fishingrodcatchrate/0.002))+"%");
}
} }
if (this.plugin.PlayerinJob(p, "Fisherman")) { if (this.plugin.PlayerinJob(p, "Fisherman")) {
this.plugin.gainMoneyExp(p,"Fisherman",0.175,3); this.plugin.gainMoneyExp(p,"Fisherman",0.175,3);