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

r270. Bugfix to fix Halloween items Item Duping.

Browse Source
anvil_rework
sigonasr2 11 years ago
parent 7e82f339b5
commit 1382c3d4dc
14 changed files with 194 additions and 154 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. BIN
      BankEconomyMod/bin/me/kaZep/Base/Main$1.class
  2. BIN
      BankEconomyMod/bin/me/kaZep/Base/Main$2.class
  3. BIN
      BankEconomyMod/bin/me/kaZep/Base/Main$3.class
  4. BIN
      BankEconomyMod/bin/me/kaZep/Base/Main$4.class
  5. BIN
      BankEconomyMod/bin/me/kaZep/Base/Main.class
  6. BIN
      BankEconomyMod/bin/me/kaZep/Base/PlayerListener$1.class
  7. BIN
      BankEconomyMod/bin/me/kaZep/Base/PlayerListener$2.class
  8. BIN
      BankEconomyMod/bin/me/kaZep/Base/PlayerListener$3.class
  9. BIN
      BankEconomyMod/bin/me/kaZep/Base/PlayerListener$4.class
  10. BIN
      BankEconomyMod/bin/me/kaZep/Base/PlayerListener$5.class
  11. BIN
      BankEconomyMod/bin/me/kaZep/Base/PlayerListener$6.class
  12. BIN
      BankEconomyMod/bin/me/kaZep/Base/PlayerListener.class
  13. 12
      BankEconomyMod/src/me/kaZep/Base/Main.java
  14. 336
      BankEconomyMod/src/me/kaZep/Base/PlayerListener.java

BIN
BankEconomyMod/bin/me/kaZep/Base/Main$1.class
View File

Binary file not shown.

BIN
BankEconomyMod/bin/me/kaZep/Base/Main$2.class
View File

Binary file not shown.

BIN
BankEconomyMod/bin/me/kaZep/Base/Main$3.class
View File

Binary file not shown.

BIN
BankEconomyMod/bin/me/kaZep/Base/Main$4.class
View File

Binary file not shown.

BIN
BankEconomyMod/bin/me/kaZep/Base/Main.class
View File

Binary file not shown.

BIN
BankEconomyMod/bin/me/kaZep/Base/PlayerListener$1.class
View File

Binary file not shown.

BIN
BankEconomyMod/bin/me/kaZep/Base/PlayerListener$2.class
View File

Binary file not shown.

BIN
BankEconomyMod/bin/me/kaZep/Base/PlayerListener$3.class
View File

Binary file not shown.

BIN
BankEconomyMod/bin/me/kaZep/Base/PlayerListener$4.class
View File

Binary file not shown.

BIN
BankEconomyMod/bin/me/kaZep/Base/PlayerListener$5.class
View File

Binary file not shown.

BIN
BankEconomyMod/bin/me/kaZep/Base/PlayerListener$6.class
View File

Binary file not shown.

BIN
BankEconomyMod/bin/me/kaZep/Base/PlayerListener.class
View File

Binary file not shown.

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

@ -10,6 +10,7 @@ import java.util.ArrayList;
import java.util.Collection; import java.util.Collection;
import java.util.ConcurrentModificationException; import java.util.ConcurrentModificationException;
import java.util.Date; import java.util.Date;
import java.util.HashMap;
import java.util.Iterator; import java.util.Iterator;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
@ -112,6 +113,8 @@ public class Main extends JavaPlugin
public Location REVIVE_EFFECT_LOC; public Location REVIVE_EFFECT_LOC;
public int BOSS_DEFEAT=0; public int BOSS_DEFEAT=0;
public Location BOSS_DEFEAT_LOC; public Location BOSS_DEFEAT_LOC;
public int POLYMORPH=0;
public Location POLYMORPH_LOC;
public int LOGGING_UPDATE_COUNTS=-1; public int LOGGING_UPDATE_COUNTS=-1;
public int MAX_LOGGING_COUNT=12; public int MAX_LOGGING_COUNT=12;
@ -153,6 +156,7 @@ public class Main extends JavaPlugin
public List<ReviveInventory> revive_inventory_list = null; public List<ReviveInventory> revive_inventory_list = null;
public List<Chunk> chunk_queue_list = null; public List<Chunk> chunk_queue_list = null;
public DamageAPI DMGCALC = null; public DamageAPI DMGCALC = null;
public long lastMessage = 0;
public FileWriter outputStream = null; public FileWriter outputStream = null;
@ -879,6 +883,14 @@ public void runTick() {
} }
//Put your code here... //Put your code here...
//Bukkit.getPlayer("sigonasr2").sendMessage("Server Tick "+Bukkit.getWorld("world").getFullTime()); //Bukkit.getPlayer("sigonasr2").sendMessage("Server Tick "+Bukkit.getWorld("world").getFullTime());
if (POLYMORPH>0) {
Bukkit.getWorld("world").playEffect(new Location(POLYMORPH_LOC.getWorld(),POLYMORPH_LOC.getX()+(Math.random()-Math.random())*2,POLYMORPH_LOC.getY()+(Math.random())*2+2,POLYMORPH_LOC.getZ()+(Math.random()-Math.random())*2), Effect.STEP_SOUND, Material.EMERALD_BLOCK);
Bukkit.getWorld("world").playEffect(new Location(POLYMORPH_LOC.getWorld(),POLYMORPH_LOC.getX()+(Math.random()-Math.random())*2,POLYMORPH_LOC.getY()+(Math.random())*2+2,POLYMORPH_LOC.getZ()+(Math.random()-Math.random())*2), Effect.STEP_SOUND, Material.WATER);
if (POLYMORPH==1) {
Bukkit.getWorld("world").playEffect(new Location(POLYMORPH_LOC.getWorld(),POLYMORPH_LOC.getX()+(Math.random()-Math.random())*2,POLYMORPH_LOC.getY()+(Math.random())*2+2,POLYMORPH_LOC.getZ()+(Math.random()-Math.random())*2), Effect.POTION_BREAK, 0);
}
POLYMORPH--;
}
if (BOSS_DEFEAT>0) { if (BOSS_DEFEAT>0) {
if (BOSS_DEFEAT%4==0) { if (BOSS_DEFEAT%4==0) {
Bukkit.getWorld("world").playEffect(BOSS_DEFEAT_LOC.add(Math.random()*5-Math.random()*5, BOSS_DEFEAT/20, Math.random()*5-Math.random()*5), Effect.SMOKE, 0); Bukkit.getWorld("world").playEffect(BOSS_DEFEAT_LOC.add(Math.random()*5-Math.random()*5, BOSS_DEFEAT/20, Math.random()*5-Math.random()*5), Effect.SMOKE, 0);

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

@ -760,64 +760,64 @@ public class PlayerListener
} }
} }
if (entry.getKey().getName()==Enchantment.PROTECTION_ENVIRONMENTAL.getName()) { if (entry.getKey().getName()==Enchantment.PROTECTION_ENVIRONMENTAL.getName()) {
this.plugin.gainMoneyExp(p,"Enchanter",0.08*entry.getValue(),Math.pow(4,entry.getValue())); this.plugin.gainMoneyExp(p,"Enchanter",0.08*entry.getValue(),4*Math.pow(entry.getValue(),2));
} }
if (entry.getKey().getName()==Enchantment.DAMAGE_UNDEAD.getName()) { if (entry.getKey().getName()==Enchantment.DAMAGE_UNDEAD.getName()) {
this.plugin.gainMoneyExp(p,"Enchanter",0.10*entry.getValue(),Math.pow(8,entry.getValue())); this.plugin.gainMoneyExp(p,"Enchanter",0.10*entry.getValue(),8*Math.pow(entry.getValue(),2));
} }
if (entry.getKey().getName()==Enchantment.PROTECTION_FIRE.getName()) { if (entry.getKey().getName()==Enchantment.PROTECTION_FIRE.getName()) {
this.plugin.gainMoneyExp(p,"Enchanter",0.10*entry.getValue(),Math.pow(6,entry.getValue())); this.plugin.gainMoneyExp(p,"Enchanter",0.10*entry.getValue(),6*Math.pow(entry.getValue(),2));
} }
if (entry.getKey().getName()==Enchantment.DAMAGE_ARTHROPODS.getName()) { if (entry.getKey().getName()==Enchantment.DAMAGE_ARTHROPODS.getName()) {
this.plugin.gainMoneyExp(p,"Enchanter",0.12*entry.getValue(),Math.pow(8,entry.getValue())); this.plugin.gainMoneyExp(p,"Enchanter",0.12*entry.getValue(),8*Math.pow(entry.getValue(),2));
} }
if (entry.getKey().getName()==Enchantment.PROTECTION_FALL.getName()) { if (entry.getKey().getName()==Enchantment.PROTECTION_FALL.getName()) {
this.plugin.gainMoneyExp(p,"Enchanter",0.14*entry.getValue(),Math.pow(10,entry.getValue())); this.plugin.gainMoneyExp(p,"Enchanter",0.14*entry.getValue(),10*Math.pow(entry.getValue(),2));
} }
if (entry.getKey().getName()==Enchantment.DAMAGE_ALL.getName()) { if (entry.getKey().getName()==Enchantment.DAMAGE_ALL.getName()) {
this.plugin.gainMoneyExp(p,"Enchanter",0.15*entry.getValue(),Math.pow(14,entry.getValue())); this.plugin.gainMoneyExp(p,"Enchanter",0.15*entry.getValue(),14*Math.pow(entry.getValue(),2));
} }
if (entry.getKey().getName()==Enchantment.DIG_SPEED.getName()) { if (entry.getKey().getName()==Enchantment.DIG_SPEED.getName()) {
this.plugin.gainMoneyExp(p,"Enchanter",0.15*entry.getValue(),Math.pow(14,entry.getValue())); this.plugin.gainMoneyExp(p,"Enchanter",0.15*entry.getValue(),14*Math.pow(entry.getValue(),2));
} }
if (entry.getKey().getName()==Enchantment.PROTECTION_EXPLOSIONS.getName()) { if (entry.getKey().getName()==Enchantment.PROTECTION_EXPLOSIONS.getName()) {
this.plugin.gainMoneyExp(p,"Enchanter",0.20*entry.getValue(),Math.pow(16,entry.getValue())); this.plugin.gainMoneyExp(p,"Enchanter",0.20*entry.getValue(),16*Math.pow(entry.getValue(),2));
} }
if (entry.getKey().getName()==Enchantment.THORNS.getName()) { if (entry.getKey().getName()==Enchantment.THORNS.getName()) {
this.plugin.gainMoneyExp(p,"Enchanter",0.20*entry.getValue(),Math.pow(16,entry.getValue())); this.plugin.gainMoneyExp(p,"Enchanter",0.20*entry.getValue(),16*Math.pow(entry.getValue(),2));
} }
if (entry.getKey().getName()==Enchantment.KNOCKBACK.getName()) { if (entry.getKey().getName()==Enchantment.KNOCKBACK.getName()) {
this.plugin.gainMoneyExp(p,"Enchanter",0.20*entry.getValue(),Math.pow(18,entry.getValue())); this.plugin.gainMoneyExp(p,"Enchanter",0.20*entry.getValue(),18*Math.pow(entry.getValue(),2));
} }
if (entry.getKey().getName()==Enchantment.ARROW_KNOCKBACK.getName()) { if (entry.getKey().getName()==Enchantment.ARROW_KNOCKBACK.getName()) {
this.plugin.gainMoneyExp(p,"Enchanter",0.20*entry.getValue(),Math.pow(18,entry.getValue())); this.plugin.gainMoneyExp(p,"Enchanter",0.20*entry.getValue(),18*Math.pow(entry.getValue(),2));
} }
if (entry.getKey().getName()==Enchantment.FIRE_ASPECT.getName()) { if (entry.getKey().getName()==Enchantment.FIRE_ASPECT.getName()) {
this.plugin.gainMoneyExp(p,"Enchanter",0.22*entry.getValue(),Math.pow(20,entry.getValue())); this.plugin.gainMoneyExp(p,"Enchanter",0.22*entry.getValue(),20*Math.pow(entry.getValue(),2));
} }
if (entry.getKey().getName()==Enchantment.ARROW_FIRE.getName()) { if (entry.getKey().getName()==Enchantment.ARROW_FIRE.getName()) {
this.plugin.gainMoneyExp(p,"Enchanter",0.22*entry.getValue(),Math.pow(20,entry.getValue())); this.plugin.gainMoneyExp(p,"Enchanter",0.22*entry.getValue(),20*Math.pow(entry.getValue(),2));
} }
if (entry.getKey().getName()==Enchantment.WATER_WORKER.getName()) { if (entry.getKey().getName()==Enchantment.WATER_WORKER.getName()) {
this.plugin.gainMoneyExp(p,"Enchanter",0.25*entry.getValue(),Math.pow(16,entry.getValue())); this.plugin.gainMoneyExp(p,"Enchanter",0.25*entry.getValue(),16*Math.pow(entry.getValue(),2));
} }
if (entry.getKey().getName()==Enchantment.OXYGEN.getName()) { if (entry.getKey().getName()==Enchantment.OXYGEN.getName()) {
this.plugin.gainMoneyExp(p,"Enchanter",0.30*entry.getValue(),Math.pow(20,entry.getValue())); this.plugin.gainMoneyExp(p,"Enchanter",0.30*entry.getValue(),20*Math.pow(entry.getValue(),2));
} }
if (entry.getKey().getName()==Enchantment.DURABILITY.getName()) { if (entry.getKey().getName()==Enchantment.DURABILITY.getName()) {
this.plugin.gainMoneyExp(p,"Enchanter",0.35*entry.getValue(),Math.pow(24,entry.getValue())); this.plugin.gainMoneyExp(p,"Enchanter",0.35*entry.getValue(),24*Math.pow(entry.getValue(),2));
} }
if (entry.getKey().getName()==Enchantment.ARROW_INFINITE.getName()) { if (entry.getKey().getName()==Enchantment.ARROW_INFINITE.getName()) {
this.plugin.gainMoneyExp(p,"Enchanter",0.40*entry.getValue(),Math.pow(40,entry.getValue())); this.plugin.gainMoneyExp(p,"Enchanter",0.40*entry.getValue(),40*Math.pow(entry.getValue(),2));
} }
if (entry.getKey().getName()==Enchantment.LOOT_BONUS_MOBS.getName()) { if (entry.getKey().getName()==Enchantment.LOOT_BONUS_MOBS.getName()) {
this.plugin.gainMoneyExp(p,"Enchanter",0.40*entry.getValue(),Math.pow(30,entry.getValue())); this.plugin.gainMoneyExp(p,"Enchanter",0.40*entry.getValue(),30*Math.pow(entry.getValue(),2));
} }
if (entry.getKey().getName()==Enchantment.LOOT_BONUS_BLOCKS.getName()) { if (entry.getKey().getName()==Enchantment.LOOT_BONUS_BLOCKS.getName()) {
this.plugin.gainMoneyExp(p,"Enchanter",0.50*entry.getValue(),Math.pow(40,entry.getValue())); this.plugin.gainMoneyExp(p,"Enchanter",0.50*entry.getValue(),40*Math.pow(entry.getValue(),2));
} }
if (entry.getKey().getName()==Enchantment.SILK_TOUCH.getName()) { if (entry.getKey().getName()==Enchantment.SILK_TOUCH.getName()) {
this.plugin.gainMoneyExp(p,"Enchanter",0.50*entry.getValue(),Math.pow(40,entry.getValue())); this.plugin.gainMoneyExp(p,"Enchanter",0.50*entry.getValue(),40*Math.pow(entry.getValue(),2));
} }
} }
} }
@ -1785,7 +1785,10 @@ public class PlayerListener
Entity newAnimal = world.spawnEntity(oldloc, types[(int)(Math.random()*types.length)]); Entity newAnimal = world.spawnEntity(oldloc, types[(int)(Math.random()*types.length)]);
if (newAnimal instanceof LivingEntity) { if (newAnimal instanceof LivingEntity) {
LivingEntity l2 = (LivingEntity)newAnimal; LivingEntity l2 = (LivingEntity)newAnimal;
l2.setRemoveWhenFarAway(false);
l2.setCustomName(ChatColor.DARK_AQUA+"Polymorphed Creature"); l2.setCustomName(ChatColor.DARK_AQUA+"Polymorphed Creature");
this.plugin.POLYMORPH=10;
this.plugin.POLYMORPH_LOC=l2.getLocation();
} }
this.plugin.getAccountsConfig().set(ev.getPlayer().getName()+".halloween.wand",Long.valueOf(Bukkit.getWorld("world").getFullTime()+1200)); this.plugin.getAccountsConfig().set(ev.getPlayer().getName()+".halloween.wand",Long.valueOf(Bukkit.getWorld("world").getFullTime()+1200));
} else { } else {
@ -1819,7 +1822,10 @@ public class PlayerListener
Entity newAnimal = world.spawnEntity(oldloc, types[(int)(Math.random()*types.length)]); Entity newAnimal = world.spawnEntity(oldloc, types[(int)(Math.random()*types.length)]);
if (newAnimal instanceof LivingEntity) { if (newAnimal instanceof LivingEntity) {
LivingEntity l2 = (LivingEntity)newAnimal; LivingEntity l2 = (LivingEntity)newAnimal;
l2.setRemoveWhenFarAway(false);
l2.setCustomName(ChatColor.DARK_AQUA+"Polymorphed Creature"); l2.setCustomName(ChatColor.DARK_AQUA+"Polymorphed Creature");
this.plugin.POLYMORPH=10;
this.plugin.POLYMORPH_LOC=l2.getLocation();
} }
this.plugin.getAccountsConfig().set(ev.getPlayer().getName()+".halloween.wand",Long.valueOf(Bukkit.getWorld("world").getFullTime()+1200)); this.plugin.getAccountsConfig().set(ev.getPlayer().getName()+".halloween.wand",Long.valueOf(Bukkit.getWorld("world").getFullTime()+1200));
} }
@ -1936,7 +1942,7 @@ public class PlayerListener
} }
} }
} }
if (block || (test.getCustomName()!=null && (test.getCustomName().contains(ChatColor.DARK_PURPLE+"") || test.getType()==EntityType.ENDER_DRAGON || test.getCustomName().contains(ChatColor.DARK_AQUA+"")))) { if (block || (test.getCustomName()!=null && (test.getCustomName().contains(ChatColor.DARK_PURPLE+"") || test.getType()==EntityType.ENDER_DRAGON || test.getCustomName().contains(ChatColor.DARK_AQUA+"") || !test.getRemoveWhenFarAway()))) {
despawn=false; //This is an epic boss and its healthbar. WE can't just despawn it. despawn=false; //This is an epic boss and its healthbar. WE can't just despawn it.
} }
} }
@ -2341,7 +2347,7 @@ public class PlayerListener
} }
} }
} else { } else {
l.addPotionEffect(new PotionEffect(PotionEffectType.INCREASE_DAMAGE,999999,0)); ////l.addPotionEffect(new PotionEffect(PotionEffectType.INCREASE_DAMAGE,999999,0));
} }
if (Math.random()>=0.25) { if (Math.random()>=0.25) {
if (Math.random()<=0.75) { if (Math.random()<=0.75) {
@ -2390,12 +2396,12 @@ public class PlayerListener
if (Math.random()<=0.65) { if (Math.random()<=0.65) {
if (Math.random()<=0.75) { if (Math.random()<=0.75) {
ItemStack new_bow = new ItemStack(Material.BOW); ItemStack new_bow = new ItemStack(Material.BOW);
new_bow.addUnsafeEnchantment(Enchantment.ARROW_DAMAGE, 1); new_bow.addUnsafeEnchantment(Enchantment.ARROW_DAMAGE, 2);
new_bow.addUnsafeEnchantment(Enchantment.ARROW_KNOCKBACK, 1); new_bow.addUnsafeEnchantment(Enchantment.ARROW_KNOCKBACK, 1);
l.getEquipment().setItemInHand(new_bow); l.getEquipment().setItemInHand(new_bow);
} else { } else {
ItemStack new_bow = new ItemStack(Material.BOW); ItemStack new_bow = new ItemStack(Material.BOW);
new_bow.addUnsafeEnchantment(Enchantment.ARROW_DAMAGE, 2); new_bow.addUnsafeEnchantment(Enchantment.ARROW_DAMAGE, 3);
new_bow.addUnsafeEnchantment(Enchantment.ARROW_KNOCKBACK, 1); new_bow.addUnsafeEnchantment(Enchantment.ARROW_KNOCKBACK, 1);
l.getEquipment().setItemInHand(new_bow); l.getEquipment().setItemInHand(new_bow);
} }
@ -2403,10 +2409,10 @@ public class PlayerListener
} else { } else {
if (Math.random()<=0.65) { if (Math.random()<=0.65) {
if (Math.random()<=0.75) { if (Math.random()<=0.75) {
l.addPotionEffect(new PotionEffect(PotionEffectType.INCREASE_DAMAGE,999999,0)); ////l.addPotionEffect(new PotionEffect(PotionEffectType.INCREASE_DAMAGE,999999,1));
} else { } else {
l.addPotionEffect(new PotionEffect(PotionEffectType.INCREASE_DAMAGE,999999,0)); ////l.addPotionEffect(new PotionEffect(PotionEffectType.INCREASE_DAMAGE,999999,1));
l.addPotionEffect(new PotionEffect(PotionEffectType.JUMP,999999,0)); //l.addPotionEffect(new PotionEffect(PotionEffectType.JUMP,999999,0));
} }
} }
} }
@ -2457,12 +2463,12 @@ public class PlayerListener
if (Math.random()<=0.65) { if (Math.random()<=0.65) {
if (Math.random()<=0.75) { if (Math.random()<=0.75) {
ItemStack new_bow = new ItemStack(Material.BOW); ItemStack new_bow = new ItemStack(Material.BOW);
new_bow.addUnsafeEnchantment(Enchantment.ARROW_DAMAGE, 2); new_bow.addUnsafeEnchantment(Enchantment.ARROW_DAMAGE, 3);
new_bow.addUnsafeEnchantment(Enchantment.ARROW_KNOCKBACK, 1); new_bow.addUnsafeEnchantment(Enchantment.ARROW_KNOCKBACK, 1);
l.getEquipment().setItemInHand(new_bow); l.getEquipment().setItemInHand(new_bow);
} else { } else {
ItemStack new_bow = new ItemStack(Material.BOW); ItemStack new_bow = new ItemStack(Material.BOW);
new_bow.addUnsafeEnchantment(Enchantment.ARROW_DAMAGE, 2); new_bow.addUnsafeEnchantment(Enchantment.ARROW_DAMAGE, 4);
new_bow.addUnsafeEnchantment(Enchantment.ARROW_KNOCKBACK, 1); new_bow.addUnsafeEnchantment(Enchantment.ARROW_KNOCKBACK, 1);
new_bow.addUnsafeEnchantment(Enchantment.ARROW_FIRE, 1); new_bow.addUnsafeEnchantment(Enchantment.ARROW_FIRE, 1);
l.getEquipment().setItemInHand(new_bow); l.getEquipment().setItemInHand(new_bow);
@ -2471,10 +2477,10 @@ public class PlayerListener
} else { } else {
if (Math.random()<=0.65) { if (Math.random()<=0.65) {
if (Math.random()<=0.75) { if (Math.random()<=0.75) {
l.addPotionEffect(new PotionEffect(PotionEffectType.INCREASE_DAMAGE,999999,1)); ////l.addPotionEffect(new PotionEffect(PotionEffectType.INCREASE_DAMAGE,999999,2));
} else { } else {
l.addPotionEffect(new PotionEffect(PotionEffectType.INCREASE_DAMAGE,999999,1)); ////l.addPotionEffect(new PotionEffect(PotionEffectType.INCREASE_DAMAGE,999999,2));
l.addPotionEffect(new PotionEffect(PotionEffectType.JUMP,999999,0)); //l.addPotionEffect(new PotionEffect(PotionEffectType.JUMP,999999,0));
} }
} }
} }
@ -2525,20 +2531,20 @@ public class PlayerListener
if (Math.random()<=0.80) { if (Math.random()<=0.80) {
if (Math.random()<=0.75) { if (Math.random()<=0.75) {
ItemStack enchanted = new ItemStack(Material.DIAMOND_SWORD); ItemStack enchanted = new ItemStack(Material.DIAMOND_SWORD);
enchanted.addUnsafeEnchantment(Enchantment.DAMAGE_ALL, (int)(Math.random()*1.0d)+1); //enchanted.addUnsafeEnchantment(Enchantment.DAMAGE_ALL, (int)(Math.random()*2.0d)+1);
if (Math.random()<=0.5) { if (Math.random()<=0.5) {
enchanted.addUnsafeEnchantment(Enchantment.KNOCKBACK, (int)(Math.random()*1.0d)+1); enchanted.addUnsafeEnchantment(Enchantment.KNOCKBACK, (int)(Math.random()*2.0d)+1);
} else { } else {
enchanted.addUnsafeEnchantment(Enchantment.FIRE_ASPECT, (int)(Math.random()*1.0d)+1); enchanted.addUnsafeEnchantment(Enchantment.FIRE_ASPECT, (int)(Math.random()*2.0d)+1);
} }
l.getEquipment().setItemInHand(enchanted); l.getEquipment().setItemInHand(enchanted);
} else { } else {
ItemStack enchanted = new ItemStack(Material.GOLD_SWORD); ItemStack enchanted = new ItemStack(Material.GOLD_SWORD);
enchanted.addUnsafeEnchantment(Enchantment.DAMAGE_ALL, (int)(Math.random()*1.0d)+1); //enchanted.addUnsafeEnchantment(Enchantment.DAMAGE_ALL, (int)(Math.random()*2.0d)+1);
if (Math.random()<=0.5) { if (Math.random()<=0.5) {
enchanted.addUnsafeEnchantment(Enchantment.KNOCKBACK, (int)(Math.random()*1.0d)+1); enchanted.addUnsafeEnchantment(Enchantment.KNOCKBACK, (int)(Math.random()*2.0d)+1);
} else { } else {
enchanted.addUnsafeEnchantment(Enchantment.FIRE_ASPECT, (int)(Math.random()*2.0d)+1); enchanted.addUnsafeEnchantment(Enchantment.FIRE_ASPECT, (int)(Math.random()*4.0d)+1);
} }
l.getEquipment().setItemInHand(enchanted); l.getEquipment().setItemInHand(enchanted);
} }
@ -2548,26 +2554,26 @@ public class PlayerListener
if (Math.random()<=0.65) { if (Math.random()<=0.65) {
if (Math.random()<=0.75) { if (Math.random()<=0.75) {
ItemStack new_bow = new ItemStack(Material.BOW); ItemStack new_bow = new ItemStack(Material.BOW);
new_bow.addUnsafeEnchantment(Enchantment.ARROW_DAMAGE, 3); new_bow.addUnsafeEnchantment(Enchantment.ARROW_DAMAGE, 5);
new_bow.addUnsafeEnchantment(Enchantment.ARROW_KNOCKBACK, 1); new_bow.addUnsafeEnchantment(Enchantment.ARROW_KNOCKBACK, 1);
new_bow.addUnsafeEnchantment(Enchantment.ARROW_FIRE, 1); new_bow.addUnsafeEnchantment(Enchantment.ARROW_FIRE, 1);
l.getEquipment().setItemInHand(new_bow); l.getEquipment().setItemInHand(new_bow);
} else { } else {
ItemStack new_bow = new ItemStack(Material.BOW); ItemStack new_bow = new ItemStack(Material.BOW);
new_bow.addUnsafeEnchantment(Enchantment.ARROW_DAMAGE, 3); new_bow.addUnsafeEnchantment(Enchantment.ARROW_DAMAGE, 4);
new_bow.addUnsafeEnchantment(Enchantment.ARROW_KNOCKBACK, 2); new_bow.addUnsafeEnchantment(Enchantment.ARROW_KNOCKBACK, 2);
new_bow.addUnsafeEnchantment(Enchantment.ARROW_FIRE, 1); new_bow.addUnsafeEnchantment(Enchantment.ARROW_FIRE, 2);
l.getEquipment().setItemInHand(new_bow); l.getEquipment().setItemInHand(new_bow);
} }
} }
} else { } else {
if (Math.random()<=0.65) { if (Math.random()<=0.65) {
if (Math.random()<=0.75) { if (Math.random()<=0.75) {
l.addPotionEffect(new PotionEffect(PotionEffectType.INCREASE_DAMAGE,999999,1)); ////l.addPotionEffect(new PotionEffect(PotionEffectType.INCREASE_DAMAGE,999999,2));
l.addPotionEffect(new PotionEffect(PotionEffectType.SPEED,999999,0)); l.addPotionEffect(new PotionEffect(PotionEffectType.SPEED,999999,0));
} else { } else {
l.addPotionEffect(new PotionEffect(PotionEffectType.INCREASE_DAMAGE,999999,1)); ////l.addPotionEffect(new PotionEffect(PotionEffectType.INCREASE_DAMAGE,999999,2));
l.addPotionEffect(new PotionEffect(PotionEffectType.JUMP,999999,0)); //l.addPotionEffect(new PotionEffect(PotionEffectType.JUMP,999999,1));
l.addPotionEffect(new PotionEffect(PotionEffectType.SPEED,999999,0)); l.addPotionEffect(new PotionEffect(PotionEffectType.SPEED,999999,0));
} }
} }
@ -2577,7 +2583,7 @@ public class PlayerListener
l.getEquipment().setChestplate(new ItemStack(Material.DIAMOND_CHESTPLATE)); l.getEquipment().setChestplate(new ItemStack(Material.DIAMOND_CHESTPLATE));
} else { } else {
ItemStack enchanted = new ItemStack(Material.DIAMOND_CHESTPLATE); ItemStack enchanted = new ItemStack(Material.DIAMOND_CHESTPLATE);
enchanted.addUnsafeEnchantment(Enchantment.PROTECTION_ENVIRONMENTAL, (int)(Math.random()*1.0d)+1); enchanted.addUnsafeEnchantment(Enchantment.PROTECTION_ENVIRONMENTAL, (int)(Math.random()*2.0d)+1);
if (Math.random()<=0.5) { if (Math.random()<=0.5) {
enchanted.addUnsafeEnchantment(Enchantment.THORNS, (int)(Math.random()*1.0d)+1); enchanted.addUnsafeEnchantment(Enchantment.THORNS, (int)(Math.random()*1.0d)+1);
} }
@ -2588,9 +2594,9 @@ public class PlayerListener
l.getEquipment().setLeggings(new ItemStack(Material.DIAMOND_LEGGINGS)); l.getEquipment().setLeggings(new ItemStack(Material.DIAMOND_LEGGINGS));
} else { } else {
ItemStack enchanted = new ItemStack(Material.DIAMOND_LEGGINGS); ItemStack enchanted = new ItemStack(Material.DIAMOND_LEGGINGS);
enchanted.addUnsafeEnchantment(Enchantment.PROTECTION_ENVIRONMENTAL, (int)(Math.random()*1.0d)+1); enchanted.addUnsafeEnchantment(Enchantment.PROTECTION_ENVIRONMENTAL, (int)(Math.random()*2.0d)+1);
if (Math.random()<=0.5) { if (Math.random()<=0.5) {
enchanted.addUnsafeEnchantment(Enchantment.THORNS, (int)(Math.random()*1.0d)+1); enchanted.addUnsafeEnchantment(Enchantment.THORNS, (int)(Math.random()*2.0d)+1);
} }
l.getEquipment().setLeggings(enchanted); l.getEquipment().setLeggings(enchanted);
} }
@ -2599,9 +2605,9 @@ public class PlayerListener
l.getEquipment().setHelmet(new ItemStack(Material.DIAMOND_HELMET)); l.getEquipment().setHelmet(new ItemStack(Material.DIAMOND_HELMET));
} else { } else {
ItemStack enchanted = new ItemStack(Material.DIAMOND_HELMET); ItemStack enchanted = new ItemStack(Material.DIAMOND_HELMET);
enchanted.addUnsafeEnchantment(Enchantment.PROTECTION_ENVIRONMENTAL, (int)(Math.random()*1.0d)+1); enchanted.addUnsafeEnchantment(Enchantment.PROTECTION_ENVIRONMENTAL, (int)(Math.random()*2.0d)+1);
if (Math.random()<=0.5) { if (Math.random()<=0.5) {
enchanted.addUnsafeEnchantment(Enchantment.THORNS, (int)(Math.random()*1.0d)+1); enchanted.addUnsafeEnchantment(Enchantment.THORNS, (int)(Math.random()*2.0d)+1);
} }
l.getEquipment().setHelmet(new ItemStack(Material.DIAMOND_HELMET)); l.getEquipment().setHelmet(new ItemStack(Material.DIAMOND_HELMET));
} }
@ -2610,9 +2616,9 @@ public class PlayerListener
l.getEquipment().setBoots(new ItemStack(Material.DIAMOND_BOOTS)); l.getEquipment().setBoots(new ItemStack(Material.DIAMOND_BOOTS));
} else { } else {
ItemStack enchanted = new ItemStack(Material.DIAMOND_BOOTS); ItemStack enchanted = new ItemStack(Material.DIAMOND_BOOTS);
enchanted.addUnsafeEnchantment(Enchantment.PROTECTION_ENVIRONMENTAL, (int)(Math.random()*1.0d)+1); enchanted.addUnsafeEnchantment(Enchantment.PROTECTION_ENVIRONMENTAL, (int)(Math.random()*2.0d)+1);
if (Math.random()<=0.5) { if (Math.random()<=0.5) {
enchanted.addUnsafeEnchantment(Enchantment.THORNS, (int)(Math.random()*1.0d)+1); enchanted.addUnsafeEnchantment(Enchantment.THORNS, (int)(Math.random()*2.0d)+1);
} }
l.getEquipment().setBoots(new ItemStack(Material.DIAMOND_BOOTS)); l.getEquipment().setBoots(new ItemStack(Material.DIAMOND_BOOTS));
} }
@ -2631,20 +2637,20 @@ public class PlayerListener
if (Math.random()<=0.80) { if (Math.random()<=0.80) {
if (Math.random()<=0.75) { if (Math.random()<=0.75) {
ItemStack enchanted = new ItemStack(Material.DIAMOND_SWORD); ItemStack enchanted = new ItemStack(Material.DIAMOND_SWORD);
enchanted.addUnsafeEnchantment(Enchantment.DAMAGE_ALL, (int)(Math.random()*2.0d)+1); //enchanted.addUnsafeEnchantment(Enchantment.DAMAGE_ALL, (int)(Math.random()*4.0d)+1);
if (Math.random()<=0.5) { if (Math.random()<=0.5) {
enchanted.addUnsafeEnchantment(Enchantment.KNOCKBACK, (int)(Math.random()*2.0d)+1); enchanted.addUnsafeEnchantment(Enchantment.KNOCKBACK, (int)(Math.random()*3.0d)+1);
} else { } else {
enchanted.addUnsafeEnchantment(Enchantment.FIRE_ASPECT, (int)(Math.random()*1.0d)+1); enchanted.addUnsafeEnchantment(Enchantment.FIRE_ASPECT, (int)(Math.random()*2.0d)+1);
} }
l.getEquipment().setItemInHand(enchanted); l.getEquipment().setItemInHand(enchanted);
} else { } else {
ItemStack enchanted = new ItemStack(Material.GOLD_SWORD); ItemStack enchanted = new ItemStack(Material.GOLD_SWORD);
enchanted.addUnsafeEnchantment(Enchantment.DAMAGE_ALL, (int)(Math.random()*2.0d)+1); //enchanted.addUnsafeEnchantment(Enchantment.DAMAGE_ALL, (int)(Math.random()*4.0d)+1);
if (Math.random()<=0.5) { if (Math.random()<=0.5) {
enchanted.addUnsafeEnchantment(Enchantment.KNOCKBACK, (int)(Math.random()*2.0d)+1); enchanted.addUnsafeEnchantment(Enchantment.KNOCKBACK, (int)(Math.random()*3.0d)+1);
} else { } else {
enchanted.addUnsafeEnchantment(Enchantment.FIRE_ASPECT, (int)(Math.random()*1.0d)+1); enchanted.addUnsafeEnchantment(Enchantment.FIRE_ASPECT, (int)(Math.random()*2.0d)+1);
} }
l.getEquipment().setItemInHand(enchanted); l.getEquipment().setItemInHand(enchanted);
} }
@ -2654,27 +2660,27 @@ public class PlayerListener
if (Math.random()<=0.65) { if (Math.random()<=0.65) {
if (Math.random()<=0.75) { if (Math.random()<=0.75) {
ItemStack new_bow = new ItemStack(Material.BOW); ItemStack new_bow = new ItemStack(Material.BOW);
new_bow.addUnsafeEnchantment(Enchantment.ARROW_DAMAGE, 2); new_bow.addUnsafeEnchantment(Enchantment.ARROW_DAMAGE, 5);
new_bow.addUnsafeEnchantment(Enchantment.ARROW_KNOCKBACK, 1); new_bow.addUnsafeEnchantment(Enchantment.ARROW_KNOCKBACK, 1);
new_bow.addUnsafeEnchantment(Enchantment.ARROW_FIRE, 1); new_bow.addUnsafeEnchantment(Enchantment.ARROW_FIRE, 2);
l.getEquipment().setItemInHand(new_bow); l.getEquipment().setItemInHand(new_bow);
} else { } else {
ItemStack new_bow = new ItemStack(Material.BOW); ItemStack new_bow = new ItemStack(Material.BOW);
new_bow.addUnsafeEnchantment(Enchantment.ARROW_DAMAGE, 2); new_bow.addUnsafeEnchantment(Enchantment.ARROW_DAMAGE, 6);
new_bow.addUnsafeEnchantment(Enchantment.ARROW_KNOCKBACK, 2); new_bow.addUnsafeEnchantment(Enchantment.ARROW_KNOCKBACK, 2);
new_bow.addUnsafeEnchantment(Enchantment.ARROW_FIRE, 1); new_bow.addUnsafeEnchantment(Enchantment.ARROW_FIRE, 3);
l.getEquipment().setItemInHand(new_bow); l.getEquipment().setItemInHand(new_bow);
} }
} }
} else { } else {
if (Math.random()<=0.65) { if (Math.random()<=0.65) {
if (Math.random()<=0.75) { if (Math.random()<=0.75) {
l.addPotionEffect(new PotionEffect(PotionEffectType.INCREASE_DAMAGE,999999,2)); ////l.addPotionEffect(new PotionEffect(PotionEffectType.INCREASE_DAMAGE,999999,3));
l.addPotionEffect(new PotionEffect(PotionEffectType.JUMP,999999,1)); //l.addPotionEffect(new PotionEffect(PotionEffectType.JUMP,999999,2));
l.addPotionEffect(new PotionEffect(PotionEffectType.SPEED,999999,1)); l.addPotionEffect(new PotionEffect(PotionEffectType.SPEED,999999,1));
} else { } else {
l.addPotionEffect(new PotionEffect(PotionEffectType.INCREASE_DAMAGE,999999,2)); ////l.addPotionEffect(new PotionEffect(PotionEffectType.INCREASE_DAMAGE,999999,4));
l.addPotionEffect(new PotionEffect(PotionEffectType.JUMP,999999,2)); //l.addPotionEffect(new PotionEffect(PotionEffectType.JUMP,999999,2));
l.addPotionEffect(new PotionEffect(PotionEffectType.SPEED,999999,1)); l.addPotionEffect(new PotionEffect(PotionEffectType.SPEED,999999,1));
} }
} }
@ -2684,12 +2690,12 @@ public class PlayerListener
l.getEquipment().setChestplate(new ItemStack(Material.DIAMOND_CHESTPLATE)); l.getEquipment().setChestplate(new ItemStack(Material.DIAMOND_CHESTPLATE));
} else { } else {
ItemStack enchanted = new ItemStack(Material.DIAMOND_CHESTPLATE); ItemStack enchanted = new ItemStack(Material.DIAMOND_CHESTPLATE);
enchanted.addUnsafeEnchantment(Enchantment.PROTECTION_ENVIRONMENTAL, (int)(Math.random()*2.0d)+1); enchanted.addUnsafeEnchantment(Enchantment.PROTECTION_ENVIRONMENTAL, (int)(Math.random()*3.0d)+1);
enchanted.addUnsafeEnchantment(Enchantment.PROTECTION_EXPLOSIONS, (int)(Math.random()*2.0d)+1); enchanted.addUnsafeEnchantment(Enchantment.PROTECTION_EXPLOSIONS, (int)(Math.random()*3.0d)+1);
enchanted.addUnsafeEnchantment(Enchantment.PROTECTION_FIRE, (int)(Math.random()*2.0d)+1); enchanted.addUnsafeEnchantment(Enchantment.PROTECTION_FIRE, (int)(Math.random()*3.0d)+1);
enchanted.addUnsafeEnchantment(Enchantment.PROTECTION_PROJECTILE, (int)(Math.random()*1.0d)+1); enchanted.addUnsafeEnchantment(Enchantment.PROTECTION_PROJECTILE, (int)(Math.random()*2.0d)+1);
if (Math.random()<=0.5) { if (Math.random()<=0.5) {
enchanted.addUnsafeEnchantment(Enchantment.THORNS, (int)(Math.random()*1.0d)+1); enchanted.addUnsafeEnchantment(Enchantment.THORNS, (int)(Math.random()*2.0d)+1);
} }
l.getEquipment().setChestplate(enchanted); l.getEquipment().setChestplate(enchanted);
} }
@ -2698,12 +2704,12 @@ public class PlayerListener
l.getEquipment().setLeggings(new ItemStack(Material.DIAMOND_LEGGINGS)); l.getEquipment().setLeggings(new ItemStack(Material.DIAMOND_LEGGINGS));
} else { } else {
ItemStack enchanted = new ItemStack(Material.DIAMOND_LEGGINGS); ItemStack enchanted = new ItemStack(Material.DIAMOND_LEGGINGS);
enchanted.addUnsafeEnchantment(Enchantment.PROTECTION_ENVIRONMENTAL, (int)(Math.random()*1.0d)+1); enchanted.addUnsafeEnchantment(Enchantment.PROTECTION_ENVIRONMENTAL, (int)(Math.random()*2.0d)+1);
enchanted.addUnsafeEnchantment(Enchantment.PROTECTION_EXPLOSIONS, (int)(Math.random()*1.0d)+1); enchanted.addUnsafeEnchantment(Enchantment.PROTECTION_EXPLOSIONS, (int)(Math.random()*2.0d)+1);
enchanted.addUnsafeEnchantment(Enchantment.PROTECTION_FIRE, (int)(Math.random()*1.0d)+1); enchanted.addUnsafeEnchantment(Enchantment.PROTECTION_FIRE, (int)(Math.random()*2.0d)+1);
enchanted.addUnsafeEnchantment(Enchantment.PROTECTION_PROJECTILE, (int)(Math.random()*1.0d)+1); enchanted.addUnsafeEnchantment(Enchantment.PROTECTION_PROJECTILE, (int)(Math.random()*2.0d)+1);
if (Math.random()<=0.5) { if (Math.random()<=0.5) {
enchanted.addUnsafeEnchantment(Enchantment.THORNS, (int)(Math.random()*1.0d)+1); enchanted.addUnsafeEnchantment(Enchantment.THORNS, (int)(Math.random()*2.0d)+1);
} }
l.getEquipment().setLeggings(enchanted); l.getEquipment().setLeggings(enchanted);
} }
@ -2712,12 +2718,12 @@ public class PlayerListener
l.getEquipment().setHelmet(new ItemStack(Material.DIAMOND_HELMET)); l.getEquipment().setHelmet(new ItemStack(Material.DIAMOND_HELMET));
} else { } else {
ItemStack enchanted = new ItemStack(Material.DIAMOND_HELMET); ItemStack enchanted = new ItemStack(Material.DIAMOND_HELMET);
enchanted.addUnsafeEnchantment(Enchantment.PROTECTION_ENVIRONMENTAL, (int)(Math.random()*2.0d)+1); enchanted.addUnsafeEnchantment(Enchantment.PROTECTION_ENVIRONMENTAL, (int)(Math.random()*4.0d)+1);
enchanted.addUnsafeEnchantment(Enchantment.PROTECTION_EXPLOSIONS, (int)(Math.random()*1.0d)+1); enchanted.addUnsafeEnchantment(Enchantment.PROTECTION_EXPLOSIONS, (int)(Math.random()*2.0d)+1);
enchanted.addUnsafeEnchantment(Enchantment.PROTECTION_FIRE, (int)(Math.random()*1.0d)+1); enchanted.addUnsafeEnchantment(Enchantment.PROTECTION_FIRE, (int)(Math.random()*2.0d)+1);
enchanted.addUnsafeEnchantment(Enchantment.PROTECTION_PROJECTILE, (int)(Math.random()*1.0d)+1); enchanted.addUnsafeEnchantment(Enchantment.PROTECTION_PROJECTILE, (int)(Math.random()*2.0d)+1);
if (Math.random()<=0.5) { if (Math.random()<=0.5) {
enchanted.addUnsafeEnchantment(Enchantment.THORNS, (int)(Math.random()*1.0d)+1); enchanted.addUnsafeEnchantment(Enchantment.THORNS, (int)(Math.random()*2.0d)+1);
} }
l.getEquipment().setHelmet(new ItemStack(Material.DIAMOND_HELMET)); l.getEquipment().setHelmet(new ItemStack(Material.DIAMOND_HELMET));
} }
@ -2726,12 +2732,12 @@ public class PlayerListener
l.getEquipment().setBoots(new ItemStack(Material.DIAMOND_BOOTS)); l.getEquipment().setBoots(new ItemStack(Material.DIAMOND_BOOTS));
} else { } else {
ItemStack enchanted = new ItemStack(Material.DIAMOND_BOOTS); ItemStack enchanted = new ItemStack(Material.DIAMOND_BOOTS);
enchanted.addUnsafeEnchantment(Enchantment.PROTECTION_ENVIRONMENTAL, (int)(Math.random()*2.0d)+1); enchanted.addUnsafeEnchantment(Enchantment.PROTECTION_ENVIRONMENTAL, (int)(Math.random()*4.0d)+1);
enchanted.addUnsafeEnchantment(Enchantment.PROTECTION_EXPLOSIONS, (int)(Math.random()*2.0d)+1); enchanted.addUnsafeEnchantment(Enchantment.PROTECTION_EXPLOSIONS, (int)(Math.random()*4.0d)+1);
enchanted.addUnsafeEnchantment(Enchantment.PROTECTION_FIRE, (int)(Math.random()*1.0d)+1); enchanted.addUnsafeEnchantment(Enchantment.PROTECTION_FIRE, (int)(Math.random()*2.0d)+1);
enchanted.addUnsafeEnchantment(Enchantment.PROTECTION_PROJECTILE, (int)(Math.random()*1.0d)+1); enchanted.addUnsafeEnchantment(Enchantment.PROTECTION_PROJECTILE, (int)(Math.random()*2.0d)+1);
if (Math.random()<=0.5) { if (Math.random()<=0.5) {
enchanted.addUnsafeEnchantment(Enchantment.THORNS, (int)(Math.random()*2.0d)+1); enchanted.addUnsafeEnchantment(Enchantment.THORNS, (int)(Math.random()*4.0d)+1);
} }
l.getEquipment().setBoots(new ItemStack(Material.DIAMOND_BOOTS)); l.getEquipment().setBoots(new ItemStack(Material.DIAMOND_BOOTS));
} }
@ -2751,26 +2757,26 @@ public class PlayerListener
l.addPotionEffect(new PotionEffect(PotionEffectType.SPEED,999999,1)); l.addPotionEffect(new PotionEffect(PotionEffectType.SPEED,999999,1));
l.addPotionEffect(new PotionEffect(PotionEffectType.DAMAGE_RESISTANCE,999999,0)); l.addPotionEffect(new PotionEffect(PotionEffectType.DAMAGE_RESISTANCE,999999,0));
l.addPotionEffect(new PotionEffect(PotionEffectType.FIRE_RESISTANCE,999999,0)); l.addPotionEffect(new PotionEffect(PotionEffectType.FIRE_RESISTANCE,999999,0));
l.addPotionEffect(new PotionEffect(PotionEffectType.JUMP,999999,0)); //l.addPotionEffect(new PotionEffect(PotionEffectType.JUMP,999999,0));
l.addPotionEffect(new PotionEffect(PotionEffectType.INCREASE_DAMAGE,999999,1)); //l.addPotionEffect(new PotionEffect(PotionEffectType.INCREASE_DAMAGE,999999,1));
if (entity.getType()==EntityType.ZOMBIE) { if (entity.getType()==EntityType.ZOMBIE) {
if (Math.random()<=0.80) { if (Math.random()<=0.80) {
if (Math.random()<=0.75) { if (Math.random()<=0.75) {
ItemStack enchanted = new ItemStack(Material.DIAMOND_SWORD); ItemStack enchanted = new ItemStack(Material.DIAMOND_SWORD);
enchanted.addUnsafeEnchantment(Enchantment.DAMAGE_ALL, (int)(Math.random()*2.0d)+1); //enchanted.addUnsafeEnchantment(Enchantment.DAMAGE_ALL, (int)(Math.random()*4.0d)+1);
if (Math.random()<=0.5) { if (Math.random()<=0.5) {
enchanted.addUnsafeEnchantment(Enchantment.KNOCKBACK, (int)(Math.random()*1.0d)+1); enchanted.addUnsafeEnchantment(Enchantment.KNOCKBACK, (int)(Math.random()*2.0d)+1);
} else { } else {
enchanted.addUnsafeEnchantment(Enchantment.FIRE_ASPECT, (int)(Math.random()*2.0d)+1); enchanted.addUnsafeEnchantment(Enchantment.FIRE_ASPECT, (int)(Math.random()*3.0d)+1);
} }
l.getEquipment().setItemInHand(enchanted); l.getEquipment().setItemInHand(enchanted);
} else { } else {
ItemStack enchanted = new ItemStack(Material.GOLD_SWORD); ItemStack enchanted = new ItemStack(Material.GOLD_SWORD);
enchanted.addUnsafeEnchantment(Enchantment.DAMAGE_ALL, (int)(Math.random()*2.0d)+1); //enchanted.addUnsafeEnchantment(Enchantment.DAMAGE_ALL, (int)(Math.random()*4.0d)+1);
if (Math.random()<=0.5) { if (Math.random()<=0.5) {
enchanted.addUnsafeEnchantment(Enchantment.KNOCKBACK, (int)(Math.random()*1.0d)+1); enchanted.addUnsafeEnchantment(Enchantment.KNOCKBACK, (int)(Math.random()*2.0d)+1);
} else { } else {
enchanted.addUnsafeEnchantment(Enchantment.FIRE_ASPECT, (int)(Math.random()*2.0d)+1); enchanted.addUnsafeEnchantment(Enchantment.FIRE_ASPECT, (int)(Math.random()*3.0d)+1);
} }
l.getEquipment().setItemInHand(enchanted); l.getEquipment().setItemInHand(enchanted);
} }
@ -2781,12 +2787,12 @@ public class PlayerListener
l.getEquipment().setChestplate(new ItemStack(Material.DIAMOND_CHESTPLATE)); l.getEquipment().setChestplate(new ItemStack(Material.DIAMOND_CHESTPLATE));
} else { } else {
ItemStack enchanted = new ItemStack(Material.DIAMOND_CHESTPLATE); ItemStack enchanted = new ItemStack(Material.DIAMOND_CHESTPLATE);
enchanted.addUnsafeEnchantment(Enchantment.PROTECTION_ENVIRONMENTAL, (int)(Math.random()*2.0d)+1); enchanted.addUnsafeEnchantment(Enchantment.PROTECTION_ENVIRONMENTAL, (int)(Math.random()*4.0d)+1);
enchanted.addUnsafeEnchantment(Enchantment.PROTECTION_EXPLOSIONS, (int)(Math.random()*2.0d)+1); enchanted.addUnsafeEnchantment(Enchantment.PROTECTION_EXPLOSIONS, (int)(Math.random()*4.0d)+1);
enchanted.addUnsafeEnchantment(Enchantment.PROTECTION_FIRE, (int)(Math.random()*2.0d)+1); enchanted.addUnsafeEnchantment(Enchantment.PROTECTION_FIRE, (int)(Math.random()*4.0d)+1);
enchanted.addUnsafeEnchantment(Enchantment.PROTECTION_PROJECTILE, (int)(Math.random()*1.0d)+1); enchanted.addUnsafeEnchantment(Enchantment.PROTECTION_PROJECTILE, (int)(Math.random()*3.0d)+1);
if (Math.random()<=0.5) { if (Math.random()<=0.5) {
enchanted.addUnsafeEnchantment(Enchantment.THORNS, (int)(Math.random()*2.0d)+1); enchanted.addUnsafeEnchantment(Enchantment.THORNS, (int)(Math.random()*4.0d)+1);
} }
l.getEquipment().setChestplate(enchanted); l.getEquipment().setChestplate(enchanted);
} }
@ -2795,12 +2801,12 @@ public class PlayerListener
l.getEquipment().setLeggings(new ItemStack(Material.DIAMOND_LEGGINGS)); l.getEquipment().setLeggings(new ItemStack(Material.DIAMOND_LEGGINGS));
} else { } else {
ItemStack enchanted = new ItemStack(Material.DIAMOND_LEGGINGS); ItemStack enchanted = new ItemStack(Material.DIAMOND_LEGGINGS);
enchanted.addUnsafeEnchantment(Enchantment.PROTECTION_ENVIRONMENTAL, (int)(Math.random()*2.0d)+1); enchanted.addUnsafeEnchantment(Enchantment.PROTECTION_ENVIRONMENTAL, (int)(Math.random()*4.0d)+1);
enchanted.addUnsafeEnchantment(Enchantment.PROTECTION_EXPLOSIONS, (int)(Math.random()*2.0d)+1); enchanted.addUnsafeEnchantment(Enchantment.PROTECTION_EXPLOSIONS, (int)(Math.random()*4.0d)+1);
enchanted.addUnsafeEnchantment(Enchantment.PROTECTION_FIRE, (int)(Math.random()*1.0d)+1); enchanted.addUnsafeEnchantment(Enchantment.PROTECTION_FIRE, (int)(Math.random()*3.0d)+1);
enchanted.addUnsafeEnchantment(Enchantment.PROTECTION_PROJECTILE, (int)(Math.random()*1.0d)+1); enchanted.addUnsafeEnchantment(Enchantment.PROTECTION_PROJECTILE, (int)(Math.random()*2.0d)+1);
if (Math.random()<=0.5) { if (Math.random()<=0.5) {
enchanted.addUnsafeEnchantment(Enchantment.THORNS, (int)(Math.random()*2.0d)+1); enchanted.addUnsafeEnchantment(Enchantment.THORNS, (int)(Math.random()*4.0d)+1);
} }
l.getEquipment().setLeggings(enchanted); l.getEquipment().setLeggings(enchanted);
} }
@ -2809,12 +2815,12 @@ public class PlayerListener
l.getEquipment().setHelmet(new ItemStack(Material.DIAMOND_HELMET)); l.getEquipment().setHelmet(new ItemStack(Material.DIAMOND_HELMET));
} else { } else {
ItemStack enchanted = new ItemStack(Material.DIAMOND_HELMET); ItemStack enchanted = new ItemStack(Material.DIAMOND_HELMET);
enchanted.addUnsafeEnchantment(Enchantment.PROTECTION_ENVIRONMENTAL, (int)(Math.random()*2.0d)+1); enchanted.addUnsafeEnchantment(Enchantment.PROTECTION_ENVIRONMENTAL, (int)(Math.random()*4.0d)+1);
enchanted.addUnsafeEnchantment(Enchantment.PROTECTION_EXPLOSIONS, (int)(Math.random()*2.0d)+1); enchanted.addUnsafeEnchantment(Enchantment.PROTECTION_EXPLOSIONS, (int)(Math.random()*4.0d)+1);
enchanted.addUnsafeEnchantment(Enchantment.PROTECTION_FIRE, (int)(Math.random()*1.0d)+1); enchanted.addUnsafeEnchantment(Enchantment.PROTECTION_FIRE, (int)(Math.random()*2.0d)+1);
enchanted.addUnsafeEnchantment(Enchantment.PROTECTION_PROJECTILE, (int)(Math.random()*1.0d)+1); enchanted.addUnsafeEnchantment(Enchantment.PROTECTION_PROJECTILE, (int)(Math.random()*2.0d)+1);
if (Math.random()<=0.5) { if (Math.random()<=0.5) {
enchanted.addUnsafeEnchantment(Enchantment.THORNS, (int)(Math.random()*2.0d)+1); enchanted.addUnsafeEnchantment(Enchantment.THORNS, (int)(Math.random()*4.0d)+1);
} }
l.getEquipment().setHelmet(new ItemStack(Material.DIAMOND_HELMET)); l.getEquipment().setHelmet(new ItemStack(Material.DIAMOND_HELMET));
} }
@ -2823,12 +2829,12 @@ public class PlayerListener
l.getEquipment().setBoots(new ItemStack(Material.DIAMOND_BOOTS)); l.getEquipment().setBoots(new ItemStack(Material.DIAMOND_BOOTS));
} else { } else {
ItemStack enchanted = new ItemStack(Material.DIAMOND_BOOTS); ItemStack enchanted = new ItemStack(Material.DIAMOND_BOOTS);
enchanted.addUnsafeEnchantment(Enchantment.PROTECTION_ENVIRONMENTAL, (int)(Math.random()*2.0d)+1); enchanted.addUnsafeEnchantment(Enchantment.PROTECTION_ENVIRONMENTAL, (int)(Math.random()*4.0d)+1);
enchanted.addUnsafeEnchantment(Enchantment.PROTECTION_EXPLOSIONS, (int)(Math.random()*2.0d)+1); enchanted.addUnsafeEnchantment(Enchantment.PROTECTION_EXPLOSIONS, (int)(Math.random()*4.0d)+1);
enchanted.addUnsafeEnchantment(Enchantment.PROTECTION_FIRE, (int)(Math.random()*2.0d)+1); enchanted.addUnsafeEnchantment(Enchantment.PROTECTION_FIRE, (int)(Math.random()*4.0d)+1);
enchanted.addUnsafeEnchantment(Enchantment.PROTECTION_PROJECTILE, (int)(Math.random()*2.0d)+1); enchanted.addUnsafeEnchantment(Enchantment.PROTECTION_PROJECTILE, (int)(Math.random()*4.0d)+1);
if (Math.random()<=0.5) { if (Math.random()<=0.5) {
enchanted.addUnsafeEnchantment(Enchantment.THORNS, (int)(Math.random()*1.0d)+1); enchanted.addUnsafeEnchantment(Enchantment.THORNS, (int)(Math.random()*2.0d)+1);
} }
l.getEquipment().setBoots(new ItemStack(Material.DIAMOND_BOOTS)); l.getEquipment().setBoots(new ItemStack(Material.DIAMOND_BOOTS));
} }
@ -6229,7 +6235,7 @@ public ItemStack getGoodie() {
boolean contains=e.getEntity() instanceof Monster; boolean contains=e.getEntity() instanceof Monster;
if (contains) { if (contains) {
LivingEntity l = (LivingEntity)e.getEntity(); LivingEntity l = (LivingEntity)e.getEntity();
if ((l.getCustomName()==null || !l.getCustomName().contains(""+ChatColor.DARK_PURPLE)) && l.getType()!=EntityType.ENDER_DRAGON) { if ((l.getCustomName()==null || (!l.getCustomName().contains(ChatColor.DARK_PURPLE+"") && !l.getCustomName().contains(ChatColor.DARK_AQUA+""))) && l.getType()!=EntityType.ENDER_DRAGON) {
if ((l.getTicksLived()<120 && e.getCause()==DamageCause.SUFFOCATION)) { if ((l.getTicksLived()<120 && e.getCause()==DamageCause.SUFFOCATION)) {
l.remove(); l.remove();
e.setCancelled(true); e.setCancelled(true);
@ -6240,7 +6246,7 @@ public ItemStack getGoodie() {
@EventHandler @EventHandler
public void onPlayerPickup(PlayerPickupItemEvent e) { public void onPlayerPickup(PlayerPickupItemEvent e) {
if (!this.plugin.inventoryFull(e.getPlayer()) && this.plugin.getAccountsConfig().getBoolean(e.getPlayer().getName()+".settings.notify1")) { if (this.plugin.getAccountsConfig().getBoolean(e.getPlayer().getName()+".settings.notify1")) {
Player p = e.getPlayer(); Player p = e.getPlayer();
String temp = e.getItem().getItemStack().getType().name().replace("_", " "); String temp = e.getItem().getItemStack().getType().name().replace("_", " ");
char[] mod = temp.toCharArray(); char[] mod = temp.toCharArray();
@ -6268,7 +6274,9 @@ public ItemStack getGoodie() {
} }
} }
} }
p.sendMessage(ChatColor.GRAY+""+ChatColor.ITALIC+"Picked up "+e.getItem().getItemStack().getAmount()+" "+String.valueOf(mod)+"."); if (e.getRemaining()==0) {
p.sendMessage(ChatColor.GRAY+""+ChatColor.ITALIC+"Picked up "+e.getItem().getItemStack().getAmount()+" "+String.valueOf(mod)+".");
}
} }
} }
@ -6330,17 +6338,19 @@ public ItemStack getGoodie() {
@EventHandler @EventHandler
public void onEnemyHit(EntityDamageByEntityEvent e) { public void onEnemyHit(EntityDamageByEntityEvent e) {
if (e.getDamager() instanceof Monster) { if (e.getDamager() instanceof Monster) {
e.setDamage(e.getDamage()*1.65d); //Damage of ALL mobs multiplied by x1.65. //e.setDamage(e.getDamage()*1.45d); //Damage of ALL mobs multiplied by x1.45.
Monster m = (Monster)e.getDamager(); Monster m = (Monster)e.getDamager();
if (m.getType()!=EntityType.ENDER_DRAGON && m.getType()!=EntityType.WITHER) { if (m.getType()!=EntityType.ENDER_DRAGON && m.getType()!=EntityType.WITHER) {
if (m.getCustomName()==null) { if (m.getCustomName()==null) {
if (m.getHealth()>65) { if (m.getMaxHealth()>65) {
m.setHealth(65); //65 HP cap. m.setMaxHealth(65); //65 HP cap.
m.setHealth(m.getMaxHealth());
} }
} else { } else {
if (!m.getCustomName().contains(ChatColor.DARK_PURPLE+"")) { //Make sure it's not a boss. if (!m.getCustomName().contains(ChatColor.DARK_PURPLE+"")) { //Make sure it's not a boss.
if (m.getHealth()>65) { if (m.getMaxHealth()>65) {
m.setHealth(65); //65 HP cap. m.setMaxHealth(65); //65 HP cap.
m.setHealth(m.getMaxHealth());
} }
} }
} }
@ -6348,17 +6358,19 @@ public ItemStack getGoodie() {
} }
if (e.getEntity() instanceof LivingEntity) { if (e.getEntity() instanceof LivingEntity) {
if (e.getDamager() instanceof Monster) { if (e.getDamager() instanceof Monster) {
e.setDamage(e.getDamage()*1.65d); //Damage of ALL mobs multiplied by x1.65. //e.setDamage(e.getDamage()*1.45d); //Damage of ALL mobs multiplied by x1.65.
Monster m = (Monster)e.getDamager(); Monster m = (Monster)e.getDamager();
if (m.getType()!=EntityType.ENDER_DRAGON && m.getType()!=EntityType.WITHER) { if (m.getType()!=EntityType.ENDER_DRAGON && m.getType()!=EntityType.WITHER) {
if (m.getCustomName()==null) { if (m.getCustomName()==null) {
if (m.getHealth()>65) { if (m.getMaxHealth()>65) {
m.setHealth(65); //65 HP cap. m.setMaxHealth(65); //65 HP cap.
m.setHealth(m.getMaxHealth());
} }
} else { } else {
if (!m.getCustomName().contains(ChatColor.DARK_PURPLE+"")) { //Make sure it's not a boss. if (!m.getCustomName().contains(ChatColor.DARK_PURPLE+"")) { //Make sure it's not a boss.
if (m.getHealth()>65) { if (m.getMaxHealth()>65) {
m.setHealth(65); //65 HP cap. m.setMaxHealth(65); //65 HP cap.
m.setHealth(m.getMaxHealth());
} }
} }
} }
@ -6500,27 +6512,29 @@ public ItemStack getGoodie() {
} }
} }
////Bukkit.getLogger().info("Made it through 1."); ////Bukkit.getLogger().info("Made it through 1.");
if (e.getDamager().getType()==EntityType.CREEPER) {
e.setDamage(e.getDamage()/2.0d);
}
if (e.getEntity().getType()==EntityType.PLAYER) { if (e.getEntity().getType()==EntityType.PLAYER) {
final Player p = (Player)e.getEntity(); final Player p = (Player)e.getEntity();
if (e.getDamager() instanceof LivingEntity) { if (e.getDamager() instanceof LivingEntity) {
final double player_starthp = p.getHealth(); final double player_starthp = p.getHealth();
final LivingEntity l = (LivingEntity)e.getDamager(); final LivingEntity l = (LivingEntity)e.getDamager();
if (p.getNoDamageTicks()<p.getMaximumNoDamageTicks()/2.0f && this.plugin.getAccountsConfig().getBoolean(p.getName()+".settings.notify5")) { if (p.getNoDamageTicks()<p.getMaximumNoDamageTicks()/2.0f && this.plugin.getAccountsConfig().getBoolean(p.getName()+".settings.notify5")) {
this.plugin.getAccountsConfig().set(p.getName()+".settings.notify5", Boolean.valueOf(false));
final Main plug = this.plugin; final Main plug = this.plugin;
Bukkit.getScheduler().scheduleSyncDelayedTask(this.plugin, new Runnable() { Bukkit.getScheduler().scheduleSyncDelayedTask(this.plugin, new Runnable() {
@Override @Override
public void run() { public void run() {
DecimalFormat df = new DecimalFormat("#0.0"); DecimalFormat df = new DecimalFormat("#0.0");
DecimalFormat df2 = new DecimalFormat("#0"); DecimalFormat df2 = new DecimalFormat("#0");
if (l.getCustomName()!=null) { if (l.getCustomName()!=null) {
p.sendMessage(ChatColor.DARK_PURPLE+""+ChatColor.ITALIC+"Took "+df.format(player_starthp-p.getHealth())+" damage from "+l.getCustomName()+" (-"+df2.format(((player_starthp-p.getHealth())/p.getMaxHealth())*100)+"%)"); p.sendMessage(ChatColor.DARK_PURPLE+""+ChatColor.ITALIC+"Took "+df.format(player_starthp-p.getHealth())+" damage from "+l.getCustomName()+ChatColor.DARK_PURPLE+""+ChatColor.ITALIC+" (-"+df2.format(((player_starthp-p.getHealth())/p.getMaxHealth())*100)+"%)");
} else { } else {
p.sendMessage(ChatColor.DARK_PURPLE+""+ChatColor.ITALIC+"Took "+df.format(player_starthp-p.getHealth())+" damage from "+ChatColor.WHITE+l.getType()+ChatColor.DARK_PURPLE+""+ChatColor.ITALIC+" (-"+df2.format(((player_starthp-p.getHealth())/p.getMaxHealth())*100)+"%)"); p.sendMessage(ChatColor.DARK_PURPLE+""+ChatColor.ITALIC+"Took "+df.format(player_starthp-p.getHealth())+" damage from "+ChatColor.WHITE+l.getType()+ChatColor.DARK_PURPLE+""+ChatColor.ITALIC+" (-"+df2.format(((player_starthp-p.getHealth())/p.getMaxHealth())*100)+"%)");
}
plug.getAccountsConfig().set(p.getName()+".settings.notify5", Boolean.valueOf(true));
} }
},1); }
},1);
} }
} }
if (p.isBlocking()) {e.setDamage(e.getDamage()/2.0d);} if (p.isBlocking()) {e.setDamage(e.getDamage()/2.0d);}
@ -7177,9 +7191,6 @@ public ItemStack getGoodie() {
e.setDamage(e.getDamage()*2); e.setDamage(e.getDamage()*2);
} }
} }
if (f.getNoDamageTicks()<f.getMaximumNoDamageTicks()/2.0f && armor_pen>0) {
double normaldmg=(this.plugin.DMGCALC.getDamage(f.getEquipment().getHelmet(), f.getEquipment().getChestplate(), f.getEquipment().getLeggings(), f.getEquipment().getBoots(), e.getDamage(), DamageCause.ENTITY_ATTACK, false));
double throughdmg=(this.plugin.DMGCALC.getDamage(new ItemStack(Material.AIR), new ItemStack(Material.AIR), new ItemStack(Material.AIR), new ItemStack(Material.AIR), e.getDamage(), DamageCause.ENTITY_ATTACK, false));
if (f.getNoDamageTicks()<f.getMaximumNoDamageTicks()/2.0f && life_steal>0) { if (f.getNoDamageTicks()<f.getMaximumNoDamageTicks()/2.0f && life_steal>0) {
if (p.getHealth()+e.getDamage()*(life_steal/100.0d)<p.getMaxHealth()) { if (p.getHealth()+e.getDamage()*(life_steal/100.0d)<p.getMaxHealth()) {
p.setHealth(p.getHealth()+e.getDamage()*(life_steal/100.0d)); p.setHealth(p.getHealth()+e.getDamage()*(life_steal/100.0d));
@ -7221,6 +7232,9 @@ public ItemStack getGoodie() {
if (this.plugin.getAccountsConfig().getInt(p.getName()+".stats.stat7")>0) { if (this.plugin.getAccountsConfig().getInt(p.getName()+".stats.stat7")>0) {
e.setDamage(e.getDamage()+(this.plugin.getStatBonus(6, this.plugin.getAccountsConfig().getInt(p.getName()+".stats.stat7"))/2)); e.setDamage(e.getDamage()+(this.plugin.getStatBonus(6, this.plugin.getAccountsConfig().getInt(p.getName()+".stats.stat7"))/2));
} }
if (f.getNoDamageTicks()<f.getMaximumNoDamageTicks()/2.0f && armor_pen>0) {
double normaldmg=(this.plugin.DMGCALC.getDamage(f.getEquipment().getHelmet(), f.getEquipment().getChestplate(), f.getEquipment().getLeggings(), f.getEquipment().getBoots(), e.getDamage(), DamageCause.ENTITY_ATTACK, false));
double throughdmg=(this.plugin.DMGCALC.getDamage(new ItemStack(Material.AIR), new ItemStack(Material.AIR), new ItemStack(Material.AIR), new ItemStack(Material.AIR), e.getDamage(), DamageCause.ENTITY_ATTACK, false));
if (throughdmg>normaldmg+armor_pen) { if (throughdmg>normaldmg+armor_pen) {
//This means some piercing can be done. //This means some piercing can be done.
//e.setDamage(normaldmg+this.plugin.getStatBonus(4, this.plugin.getAccountsConfig().getInt(p.getName()+".stats.stat5")/4)); //e.setDamage(normaldmg+this.plugin.getStatBonus(4, this.plugin.getAccountsConfig().getInt(p.getName()+".stats.stat5")/4));
@ -7253,6 +7267,7 @@ public ItemStack getGoodie() {
} }
e.setDamage(0); e.setDamage(0);
} }
if (f.getNoDamageTicks()<f.getMaximumNoDamageTicks()/2.0f && this.plugin.getAccountsConfig().getInt(p.getName()+".stats.stat5")>0) { if (f.getNoDamageTicks()<f.getMaximumNoDamageTicks()/2.0f && this.plugin.getAccountsConfig().getInt(p.getName()+".stats.stat5")>0) {
//e.setDamage(e.getDamage()+(this.plugin.getStatBonus(4, this.plugin.getAccountsConfig().getInt(p.getName()+".stats.stat5"))/4)); //e.setDamage(e.getDamage()+(this.plugin.getStatBonus(4, this.plugin.getAccountsConfig().getInt(p.getName()+".stats.stat5"))/4));
double normaldmg=(this.plugin.DMGCALC.getDamage(f.getEquipment().getHelmet(), f.getEquipment().getChestplate(), f.getEquipment().getLeggings(), f.getEquipment().getBoots(), e.getDamage(), DamageCause.ENTITY_ATTACK, false)); double normaldmg=(this.plugin.DMGCALC.getDamage(f.getEquipment().getHelmet(), f.getEquipment().getChestplate(), f.getEquipment().getLeggings(), f.getEquipment().getBoots(), e.getDamage(), DamageCause.ENTITY_ATTACK, false));
@ -8164,7 +8179,6 @@ public ItemStack getGoodie() {
if (is_halloween) { if (is_halloween) {
i.setDurability((short)0); i.setDurability((short)0);
i.setType(Material.SULPHUR); i.setType(Material.SULPHUR);
i.setAmount(1);
ItemMeta meta = i.getItemMeta(); ItemMeta meta = i.getItemMeta();
meta.setDisplayName(ChatColor.DARK_GRAY+"[BROKEN] "+meta.getDisplayName()); meta.setDisplayName(ChatColor.DARK_GRAY+"[BROKEN] "+meta.getDisplayName());
finallore.add(""); finallore.add("");
@ -8173,9 +8187,12 @@ public ItemStack getGoodie() {
//p.sendMessage("Meta is set."); //p.sendMessage("Meta is set.");
i.setItemMeta(meta); i.setItemMeta(meta);
if (this.plugin.inventoryFull(p)) { if (this.plugin.inventoryFull(p)) {
i.setAmount(0);
//Drop it on the ground since our inventory is full. //Drop it on the ground since our inventory is full.
p.sendMessage(ChatColor.LIGHT_PURPLE+"Dropped "+i.getItemMeta().getDisplayName()+ChatColor.LIGHT_PURPLE+" on the ground since there is no room in your inventory."); p.sendMessage(ChatColor.LIGHT_PURPLE+"Dropped "+i.getItemMeta().getDisplayName()+ChatColor.LIGHT_PURPLE+" on the ground since there is no room in your inventory.");
p.getWorld().dropItemNaturally(p.getLocation(), i); p.getWorld().dropItemNaturally(p.getLocation(), i);
} else {
i.setAmount(1);
} }
p.updateInventory(); p.updateInventory();
} }
@ -8782,6 +8799,15 @@ public ItemStack getGoodie() {
ItemStack item = event.getCurrentItem(); ItemStack item = event.getCurrentItem();
if (event.getInventory().getType() == InventoryType.ANVIL) if (event.getInventory().getType() == InventoryType.ANVIL)
{ {
if (item != null && item.hasItemMeta() && item.getItemMeta().hasLore()) {
List<String> lore = item.getItemMeta().getLore();
for (int i=0;i<lore.size();i++) {
if (lore.get(i).contains(ChatColor.YELLOW+"[Halloween]")) {
event.setCancelled(true);
return;
}
}
}
if (item != null && item.hasItemMeta()) { if (item != null && item.hasItemMeta()) {
String tempname = ""; String tempname = "";
@ -9938,30 +9964,32 @@ public void onEntityExpode(ExplosionPrimeEvent e) {
if (c.getCustomName()!=null) { if (c.getCustomName()!=null) {
//Bukkit.getPlayer("AaMay").sendMessage("Detected a name."); //Bukkit.getPlayer("AaMay").sendMessage("Detected a name.");
if (c.getCustomName().compareTo(ChatColor.YELLOW+"Explosive Creeper")==0) { if (c.getCustomName().compareTo(ChatColor.YELLOW+"Explosive Creeper")==0) {
//Bukkit.getWorld("world").createExplosion(c.getLocation().getX(),c.getLocation().getY(),c.getLocation().getZ(),3f,false,true); Bukkit.getWorld("world").createExplosion(c.getLocation().getX(),c.getLocation().getY(),c.getLocation().getZ(),3f,false,true);
//Bukkit.getPlayer("AaMay").sendMessage("Sent explosion"); //Bukkit.getPlayer("AaMay").sendMessage("Sent explosion");
//e.setCancelled(true); e.setCancelled(true);
e.setRadius(3f); //e.setRadius(3f);
e.setFire(false); //e.setFire(false);
} else } else
if (c.getCustomName().compareTo(ChatColor.GOLD+"Explosive Creeper II")==0) { if (c.getCustomName().compareTo(ChatColor.GOLD+"Explosive Creeper II")==0) {
//Bukkit.getWorld("world").createExplosion(c.getLocation().getX(),c.getLocation().getY(),c.getLocation().getZ(),5f,false,true); Bukkit.getWorld("world").createExplosion(c.getLocation().getX(),c.getLocation().getY(),c.getLocation().getZ(),5f,false,true);
//Bukkit.getPlayer("AaMay").sendMessage("Sent explosion"); //Bukkit.getPlayer("AaMay").sendMessage("Sent explosion");
//e.setCancelled(true); e.setCancelled(true);
e.setRadius(5f); //e.setRadius(5f);
e.setFire(false); //e.setFire(false);
} else } else
if (c.getCustomName().compareTo(ChatColor.YELLOW+"Destructive Creeper")==0) { if (c.getCustomName().compareTo(ChatColor.YELLOW+"Destructive Creeper")==0) {
Bukkit.getWorld("world").createExplosion(c.getLocation().getX(),c.getLocation().getY(),c.getLocation().getZ(),2f,true,true); Bukkit.getWorld("world").createExplosion(c.getLocation().getX(),c.getLocation().getY(),c.getLocation().getZ(),2f,true,true);
//Bukkit.getPlayer("AaMay").sendMessage("Sent explosion"); //Bukkit.getPlayer("AaMay").sendMessage("Sent explosion");
e.setRadius(2f); e.setCancelled(true);
e.setFire(true); //e.setRadius(2f);
//e.setFire(true);
} else } else
if (c.getCustomName().compareTo(ChatColor.GOLD+"Destructive Creeper II")==0) { if (c.getCustomName().compareTo(ChatColor.GOLD+"Destructive Creeper II")==0) {
Bukkit.getWorld("world").createExplosion(c.getLocation().getX(),c.getLocation().getY(),c.getLocation().getZ(),4f,true,true); Bukkit.getWorld("world").createExplosion(c.getLocation().getX(),c.getLocation().getY(),c.getLocation().getZ(),4f,true,true);
//Bukkit.getPlayer("AaMay").sendMessage("Sent explosion"); //Bukkit.getPlayer("AaMay").sendMessage("Sent explosion");
e.setRadius(4f); e.setCancelled(true);
e.setFire(true); //e.setRadius(4f);
//e.setFire(true);
} }
} }
} }

Write Preview
Loading…
Cancel
Save