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

Logic fixes, minor typos to durability system.

Browse Source
dev
sigonasr2 11 years ago
parent a53cfaf67b
commit 26d4b33a83
2 changed files with 84 additions and 70 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 4
      BankEconomyMod/src/me/kaZep/Base/Main.java
  2. 150
      BankEconomyMod/src/me/kaZep/Base/PlayerListener.java

4
BankEconomyMod/src/me/kaZep/Base/Main.java
Unescape View File

@ -4892,7 +4892,7 @@ public void payDay(int time)
} }
public boolean containsEnchantment(String s, String enchant) { public boolean containsEnchantment(String s, String enchant) {
if (s.contains(enchant)) { if (s.contains(enchant) && (!enchant.equals("Durability") || (enchant.equals("Durability") && !s.contains(ChatColor.RED+"-400% Durability")))) {
return true; return true;
} }
return false; return false;
@ -5097,7 +5097,7 @@ public void payDay(int time)
public double getEnchantmentNumb(String s) { public double getEnchantmentNumb(String s) {
//Parse the string for spaces. //Parse the string for spaces.
String[] enchant = s.split(" "); String[] enchant = s.split(" ");
if (enchant[0].contains(ChatColor.YELLOW+"")) { if (!s.contains(ChatColor.RED+"-400% Durability") && enchant[0].contains(ChatColor.YELLOW+"")) {
String newstring = ((enchant[0].replace(ChatColor.YELLOW.getChar(), ' ')).replace('%', ' ')).replace(Character.toString((char)0x00A7), Character.toString((char)0x0020)); String newstring = ((enchant[0].replace(ChatColor.YELLOW.getChar(), ' ')).replace('%', ' ')).replace(Character.toString((char)0x00A7), Character.toString((char)0x0020));
//Bukkit.getLogger().info("Enchant number is "+Double.valueOf(newstring)); //Bukkit.getLogger().info("Enchant number is "+Double.valueOf(newstring));
return Double.valueOf(newstring); return Double.valueOf(newstring);

150
BankEconomyMod/src/me/kaZep/Base/PlayerListener.java
Unescape View File

@ -9515,6 +9515,14 @@ implements Listener
for (int i=0;i<p.getEquipment().getArmorContents().length;i++) { for (int i=0;i<p.getEquipment().getArmorContents().length;i++) {
if (p.getEquipment().getArmorContents()[i]!=null && !this.plugin.isBroken(p.getEquipment().getArmorContents()[i]) && p.getEquipment().getArmorContents()[i].getItemMeta()!=null && p.getEquipment().getArmorContents()[i].getItemMeta().getLore()!=null) { if (p.getEquipment().getArmorContents()[i]!=null && !this.plugin.isBroken(p.getEquipment().getArmorContents()[i]) && p.getEquipment().getArmorContents()[i].getItemMeta()!=null && p.getEquipment().getArmorContents()[i].getItemMeta().getLore()!=null) {
for (int j=0;j<p.getEquipment().getArmorContents()[i].getItemMeta().getLore().size();j++) { for (int j=0;j<p.getEquipment().getArmorContents()[i].getItemMeta().getLore().size();j++) {
if (this.plugin.containsEnchantment(p.getEquipment().getArmorContents()[i].getItemMeta().getLore().get(j), "Block Chance")) {
Bukkit.getLogger().info("Block chance check is "+this.plugin.getEnchantmentNumb(p.getEquipment().getArmorContents()[i].getItemMeta().getLore().get(j)));
if (block_chance==0) {
block_chance+=this.plugin.getEnchantmentNumb(p.getEquipment().getArmorContents()[i].getItemMeta().getLore().get(j));
} else {
block_chance+=(100-block_chance)*(this.plugin.getEnchantmentNumb(p.getEquipment().getArmorContents()[i].getItemMeta().getLore().get(j))/100.0d);
}
}
if (this.plugin.containsEnchantment(p.getEquipment().getArmorContents()[i].getItemMeta().getLore().get(j), "Damage Reduction")) { if (this.plugin.containsEnchantment(p.getEquipment().getArmorContents()[i].getItemMeta().getLore().get(j), "Damage Reduction")) {
e.setDamage(e.getDamage()*(1-(this.plugin.getEnchantmentNumb(p.getEquipment().getArmorContents()[i].getItemMeta().getLore().get(j))/100.0d))); e.setDamage(e.getDamage()*(1-(this.plugin.getEnchantmentNumb(p.getEquipment().getArmorContents()[i].getItemMeta().getLore().get(j))/100.0d)));
} }
@ -9572,10 +9580,11 @@ implements Listener
}break; }break;
} }
}*/ }*/
p.playSound(p.getLocation(), Sound.ANVIL_LAND, 0.1f, 3.6f);
e.setCancelled(true); e.setCancelled(true);
} }
//Bukkit.getLogger().info("Made it through 4."); //Bukkit.getLogger().info("Made it through 4.");
p.updateInventory(); //p.updateInventory();
if (this.plugin.getAccountsConfig().getInt(p.getName().toLowerCase()+".stats.stat3")>0) { if (this.plugin.getAccountsConfig().getInt(p.getName().toLowerCase()+".stats.stat3")>0) {
double olddmg=e.getDamage(); double olddmg=e.getDamage();
e.setDamage(e.getDamage()*(((100-this.plugin.getStatBonus(2, this.plugin.getAccountsConfig().getInt(p.getName().toLowerCase()+".stats.stat3")/4))/100.0d))); e.setDamage(e.getDamage()*(((100-this.plugin.getStatBonus(2, this.plugin.getAccountsConfig().getInt(p.getName().toLowerCase()+".stats.stat3")/4))/100.0d)));
@ -10345,32 +10354,32 @@ implements Listener
final boolean blocked = blocked_attack; final boolean blocked = blocked_attack;
final boolean blocked_hunter = blocked_hunter_buff; final boolean blocked_hunter = blocked_hunter_buff;
final Main plug = this.plugin; final Main plug = this.plugin;
p.getServer().getScheduler().scheduleSyncDelayedTask(plugin, new Runnable() { if (p.getNoDamageTicks()<p.getMaximumNoDamageTicks()/2.0f) {
@Override p.getServer().getScheduler().scheduleSyncDelayedTask(this.plugin, new Runnable() {
public void run() { @Override
//This player lost durability, we will attempt to give it back based on certain conditions. public void run() {
//CASE 1: The player actually loses more durability if it's weak armor. //This player lost durability, we will attempt to give it back based on certain conditions.
//CASE 2: The player gains back -1 durability if they have +X% Durability. The chance of it occuring is Math.random()*X<=100 //CASE 1: The player actually loses more durability if it's weak armor.
//CASE 3: The amount lost by the blocking stat has the possibility to be gained back. //CASE 2: The player gains back -1 durability if they have +X% Durability. The chance of it occuring is Math.random()*X<=100
int helm_dura=-1,chest_dura=-1,legs_dura=-1,boots_dura=-1; //CASE 3: The amount lost by the blocking stat has the possibility to be gained back.
boolean weak_helm=false,weak_chest=false,weak_legs=false,weak_boots=false; int helm_dura=-1,chest_dura=-1,legs_dura=-1,boots_dura=-1;
if (p.getEquipment().getHelmet()!=null) {helm_dura=p.getEquipment().getHelmet().getDurability();} boolean weak_helm=false,weak_chest=false,weak_legs=false,weak_boots=false;
if (p.getEquipment().getChestplate()!=null) {chest_dura=p.getEquipment().getChestplate().getDurability();} if (p.getEquipment().getHelmet()!=null) {helm_dura=p.getEquipment().getHelmet().getDurability();}
if (p.getEquipment().getLeggings()!=null) {legs_dura=p.getEquipment().getLeggings().getDurability();} if (p.getEquipment().getChestplate()!=null) {chest_dura=p.getEquipment().getChestplate().getDurability();}
if (p.getEquipment().getBoots()!=null) {boots_dura=p.getEquipment().getBoots().getDurability();} if (p.getEquipment().getLeggings()!=null) {legs_dura=p.getEquipment().getLeggings().getDurability();}
Bukkit.getLogger().info("Durability of items are: "+helm_dura+","+chest_dura+","+legs_dura+","+boots_dura); if (p.getEquipment().getBoots()!=null) {boots_dura=p.getEquipment().getBoots().getDurability();}
int gained_back=0; Bukkit.getLogger().info("Durability of items are: "+helm_dura+","+chest_dura+","+legs_dura+","+boots_dura);
if (!blocked_hunter && blocked) { int gained_back=0;
if (p.getEquipment().getHelmet()!=null && p.getEquipment().getHelmet().hasItemMeta() && if (p.getEquipment().getHelmet()!=null && p.getEquipment().getHelmet().hasItemMeta() &&
p.getEquipment().getHelmet().getItemMeta().hasLore()) { p.getEquipment().getHelmet().getItemMeta().hasLore()) {
List<String> lore = p.getEquipment().getHelmet().getItemMeta().getLore(); List<String> lore = p.getEquipment().getHelmet().getItemMeta().getLore();
for (int i=0;i<lore.size();i++) { for (int i=0;i<lore.size();i++) {
if (plug.containsEnchantment(lore.get(i), ChatColor.RED+"-400% Durability")) { if (lore.get(i).contains(ChatColor.RED+"-400% Durability")) {
helm_dura+=3; helm_dura+=3;
weak_helm=true; weak_helm=true;
} }
if (plug.containsEnchantment(lore.get(i), "Block Chance")) { if (!blocked_hunter && blocked && plug.containsEnchantment(lore.get(i), "Block Chance")) {
helm_dura+=1; helm_dura+=3;
} }
} }
} }
@ -10378,12 +10387,12 @@ implements Listener
p.getEquipment().getChestplate().getItemMeta().hasLore()) { p.getEquipment().getChestplate().getItemMeta().hasLore()) {
List<String> lore = p.getEquipment().getChestplate().getItemMeta().getLore(); List<String> lore = p.getEquipment().getChestplate().getItemMeta().getLore();
for (int i=0;i<lore.size();i++) { for (int i=0;i<lore.size();i++) {
if (plug.containsEnchantment(lore.get(i), ChatColor.RED+"-400% Durability")) { if (lore.get(i).contains(ChatColor.RED+"-400% Durability")) {
chest_dura+=3; chest_dura+=3;
weak_chest=true; weak_chest=true;
} }
if (plug.containsEnchantment(lore.get(i), "Block Chance")) { if (!blocked_hunter && blocked && plug.containsEnchantment(lore.get(i), "Block Chance")) {
chest_dura+=1; chest_dura+=3;
} }
} }
} }
@ -10391,12 +10400,13 @@ implements Listener
p.getEquipment().getLeggings().getItemMeta().hasLore()) { p.getEquipment().getLeggings().getItemMeta().hasLore()) {
List<String> lore = p.getEquipment().getLeggings().getItemMeta().getLore(); List<String> lore = p.getEquipment().getLeggings().getItemMeta().getLore();
for (int i=0;i<lore.size();i++) { for (int i=0;i<lore.size();i++) {
if (plug.containsEnchantment(lore.get(i), ChatColor.RED+"-400% Durability")) { if (lore.get(i).contains(ChatColor.RED+"-400% Durability")) {
legs_dura+=3; legs_dura+=3;
weak_legs=true; weak_legs=true;
} }
if (plug.containsEnchantment(lore.get(i), "Block Chance")) { if (!blocked_hunter && blocked && plug.containsEnchantment(lore.get(i), "Block Chance")) {
legs_dura+=1; Bukkit.getLogger().info("Leggings Block Chance.");
legs_dura+=3;
} }
} }
} }
@ -10404,75 +10414,79 @@ implements Listener
p.getEquipment().getBoots().getItemMeta().hasLore()) { p.getEquipment().getBoots().getItemMeta().hasLore()) {
List<String> lore = p.getEquipment().getBoots().getItemMeta().getLore(); List<String> lore = p.getEquipment().getBoots().getItemMeta().getLore();
for (int i=0;i<lore.size();i++) { for (int i=0;i<lore.size();i++) {
if (plug.containsEnchantment(lore.get(i), ChatColor.RED+"-400% Durability")) { if (lore.get(i).contains(ChatColor.RED+"-400% Durability")) {
boots_dura+=3; boots_dura+=3;
weak_boots=true; weak_boots=true;
} }
if (plug.containsEnchantment(lore.get(i), "Block Chance")) { if (!blocked_hunter && blocked && plug.containsEnchantment(lore.get(i), "Block Chance")) {
boots_dura+=1; boots_dura+=3;
} }
} }
} }
} if (p.getEquipment().getHelmet()!=null && p.getEquipment().getHelmet().hasItemMeta() &&
if (p.getEquipment().getHelmet()!=null && p.getEquipment().getHelmet().hasItemMeta() && p.getEquipment().getHelmet().getItemMeta().hasLore()) {
p.getEquipment().getHelmet().getItemMeta().hasLore()) { List<String> lore = p.getEquipment().getHelmet().getItemMeta().getLore();
List<String> lore = p.getEquipment().getHelmet().getItemMeta().getLore(); for (int i=0;i<lore.size();i++) {
for (int i=0;i<lore.size();i++) { double dura_numb=0;
if (plug.containsEnchantment(lore.get(i), "Durability")) { if (plug.containsEnchantment(lore.get(i), "Durability")) {
double dura_numb=plug.getEnchantmentNumb("Durability"); dura_numb+=plug.getEnchantmentNumb("Durability");
if (!weak_helm) {dura_numb+=300;} }
if (!weak_helm) {dura_numb+=300; /*Bukkit.getLogger().info("1 not weak.");*/}
if (Math.random()*dura_numb>100) { if (Math.random()*dura_numb>100) {
helm_dura-=1; helm_dura-=1;
} }
} }
} }
} if (p.getEquipment().getChestplate()!=null && p.getEquipment().getChestplate().hasItemMeta() &&
if (p.getEquipment().getChestplate()!=null && p.getEquipment().getChestplate().hasItemMeta() && p.getEquipment().getChestplate().getItemMeta().hasLore()) {
p.getEquipment().getChestplate().getItemMeta().hasLore()) { List<String> lore = p.getEquipment().getChestplate().getItemMeta().getLore();
List<String> lore = p.getEquipment().getChestplate().getItemMeta().getLore(); for (int i=0;i<lore.size();i++) {
for (int i=0;i<lore.size();i++) { double dura_numb=0;
if (plug.containsEnchantment(lore.get(i), "Durability")) { if (plug.containsEnchantment(lore.get(i), "Durability")) {
double dura_numb=plug.getEnchantmentNumb("Durability"); dura_numb+=plug.getEnchantmentNumb("Durability");
if (!weak_chest) {dura_numb+=300;} }
if (!weak_chest) {dura_numb+=300; /*Bukkit.getLogger().info("2 not weak.");*/}
if (Math.random()*dura_numb>100) { if (Math.random()*dura_numb>100) {
chest_dura-=1; chest_dura-=1;
} }
} }
} }
} if (p.getEquipment().getLeggings()!=null && p.getEquipment().getLeggings().hasItemMeta() &&
if (p.getEquipment().getLeggings()!=null && p.getEquipment().getLeggings().hasItemMeta() && p.getEquipment().getLeggings().getItemMeta().hasLore()) {
p.getEquipment().getLeggings().getItemMeta().hasLore()) { List<String> lore = p.getEquipment().getLeggings().getItemMeta().getLore();
List<String> lore = p.getEquipment().getLeggings().getItemMeta().getLore(); for (int i=0;i<lore.size();i++) {
for (int i=0;i<lore.size();i++) { double dura_numb=0;
if (plug.containsEnchantment(lore.get(i), "Durability")) { if (plug.containsEnchantment(lore.get(i), "Durability")) {
double dura_numb=plug.getEnchantmentNumb("Durability"); dura_numb+=plug.getEnchantmentNumb("Durability");
if (!weak_legs) {dura_numb+=300;} }
if (!weak_legs) {dura_numb+=300; /*Bukkit.getLogger().info("3 not weak.");*/}
if (Math.random()*dura_numb>100) { if (Math.random()*dura_numb>100) {
legs_dura-=1; legs_dura-=1;
} }
} }
} }
} if (p.getEquipment().getBoots()!=null && p.getEquipment().getBoots().hasItemMeta() &&
if (p.getEquipment().getBoots()!=null && p.getEquipment().getBoots().hasItemMeta() && p.getEquipment().getBoots().getItemMeta().hasLore()) {
p.getEquipment().getBoots().getItemMeta().hasLore()) { List<String> lore = p.getEquipment().getBoots().getItemMeta().getLore();
List<String> lore = p.getEquipment().getBoots().getItemMeta().getLore(); for (int i=0;i<lore.size();i++) {
for (int i=0;i<lore.size();i++) { double dura_numb=0;
if (plug.containsEnchantment(lore.get(i), "Durability")) { if (plug.containsEnchantment(lore.get(i), "Durability")) {
double dura_numb=plug.getEnchantmentNumb("Durability"); dura_numb+=plug.getEnchantmentNumb("Durability");
if (!weak_boots) {dura_numb+=300;} }
if (!weak_boots) {dura_numb+=300; /*Bukkit.getLogger().info("4 not weak.");*/}
if (Math.random()*dura_numb>100) { if (Math.random()*dura_numb>100) {
boots_dura-=1; boots_dura-=1;
} }
} }
} }
if (p.getEquipment().getBoots()!=null) {ItemStack i = p.getEquipment().getBoots(); i.setDurability((short)boots_dura); p.getEquipment().setBoots(i);}
if (p.getEquipment().getLeggings()!=null) {ItemStack i = p.getEquipment().getLeggings(); i.setDurability((short)legs_dura); p.getEquipment().setLeggings(i);}
if (p.getEquipment().getChestplate()!=null) {ItemStack i = p.getEquipment().getChestplate(); i.setDurability((short)chest_dura); p.getEquipment().setChestplate(i);}
if (p.getEquipment().getHelmet()!=null) {ItemStack i = p.getEquipment().getHelmet(); i.setDurability((short)helm_dura); p.getEquipment().setHelmet(i);}
Bukkit.getLogger().info("Durability of items now are: "+helm_dura+","+chest_dura+","+legs_dura+","+boots_dura);
} }
if (p.getEquipment().getBoots()!=null) {ItemStack i = p.getEquipment().getBoots(); i.setDurability((short)boots_dura); p.getEquipment().setBoots(i);} },1);
if (p.getEquipment().getLeggings()!=null) {ItemStack i = p.getEquipment().getLeggings(); i.setDurability((short)legs_dura); p.getEquipment().setLeggings(i);} }
if (p.getEquipment().getChestplate()!=null) {ItemStack i = p.getEquipment().getChestplate(); i.setDurability((short)chest_dura); p.getEquipment().setChestplate(i);}
if (p.getEquipment().getHelmet()!=null) {ItemStack i = p.getEquipment().getHelmet(); i.setDurability((short)helm_dura); p.getEquipment().setHelmet(i);}
Bukkit.getLogger().info("Durability of items now are: "+helm_dura+","+chest_dura+","+legs_dura+","+boots_dura);
}
},1);
} }
} }

Write Preview
Loading…
Cancel
Save