diff --git a/BankEconomyMod/bin/me/kaZep/Base/Main$1.class b/BankEconomyMod/bin/me/kaZep/Base/Main$1.class index c91ee34..8f8da14 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/Main$2.class b/BankEconomyMod/bin/me/kaZep/Base/Main$2.class index e9ecb99..1031676 100644 Binary files a/BankEconomyMod/bin/me/kaZep/Base/Main$2.class and b/BankEconomyMod/bin/me/kaZep/Base/Main$2.class differ diff --git a/BankEconomyMod/bin/me/kaZep/Base/Main$3.class b/BankEconomyMod/bin/me/kaZep/Base/Main$3.class index c51f23c..7d4027a 100644 Binary files a/BankEconomyMod/bin/me/kaZep/Base/Main$3.class and b/BankEconomyMod/bin/me/kaZep/Base/Main$3.class differ diff --git a/BankEconomyMod/bin/me/kaZep/Base/Main$4.class b/BankEconomyMod/bin/me/kaZep/Base/Main$4.class index e44ffd4..ae80a5b 100644 Binary files a/BankEconomyMod/bin/me/kaZep/Base/Main$4.class and b/BankEconomyMod/bin/me/kaZep/Base/Main$4.class differ diff --git a/BankEconomyMod/bin/me/kaZep/Base/Main.class b/BankEconomyMod/bin/me/kaZep/Base/Main.class index 0f2a5dd..1393003 100644 Binary files a/BankEconomyMod/bin/me/kaZep/Base/Main.class and b/BankEconomyMod/bin/me/kaZep/Base/Main.class differ diff --git a/BankEconomyMod/bin/me/kaZep/Base/PlayerListener$1.class b/BankEconomyMod/bin/me/kaZep/Base/PlayerListener$1.class index 89dd817..54799a2 100644 Binary files a/BankEconomyMod/bin/me/kaZep/Base/PlayerListener$1.class and b/BankEconomyMod/bin/me/kaZep/Base/PlayerListener$1.class differ diff --git a/BankEconomyMod/bin/me/kaZep/Base/PlayerListener$2.class b/BankEconomyMod/bin/me/kaZep/Base/PlayerListener$2.class index b5ca952..f20e96f 100644 Binary files a/BankEconomyMod/bin/me/kaZep/Base/PlayerListener$2.class and b/BankEconomyMod/bin/me/kaZep/Base/PlayerListener$2.class differ diff --git a/BankEconomyMod/bin/me/kaZep/Base/PlayerListener$3.class b/BankEconomyMod/bin/me/kaZep/Base/PlayerListener$3.class index a09baf2..e894107 100644 Binary files a/BankEconomyMod/bin/me/kaZep/Base/PlayerListener$3.class and b/BankEconomyMod/bin/me/kaZep/Base/PlayerListener$3.class differ diff --git a/BankEconomyMod/bin/me/kaZep/Base/PlayerListener$4.class b/BankEconomyMod/bin/me/kaZep/Base/PlayerListener$4.class index 45341af..f6d2cb5 100644 Binary files a/BankEconomyMod/bin/me/kaZep/Base/PlayerListener$4.class and b/BankEconomyMod/bin/me/kaZep/Base/PlayerListener$4.class differ diff --git a/BankEconomyMod/bin/me/kaZep/Base/PlayerListener$5.class b/BankEconomyMod/bin/me/kaZep/Base/PlayerListener$5.class index 4e6d6e7..d701232 100644 Binary files a/BankEconomyMod/bin/me/kaZep/Base/PlayerListener$5.class and b/BankEconomyMod/bin/me/kaZep/Base/PlayerListener$5.class differ diff --git a/BankEconomyMod/bin/me/kaZep/Base/PlayerListener$6.class b/BankEconomyMod/bin/me/kaZep/Base/PlayerListener$6.class index 25c8a78..787fa9a 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 ebd96a4..22e8ce6 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 f0d27fe..9e2fdaa 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 c3f072f..3a50f16 100644 --- a/BankEconomyMod/src/me/kaZep/Base/Main.java +++ b/BankEconomyMod/src/me/kaZep/Base/Main.java @@ -1116,6 +1116,7 @@ public void runTick() { enderdragon.setRemoveWhenFarAway(false); //enderdragon.teleport(new Location(p.getWorld(),p.getLocation().getBlockX()+i,-250,p.getLocation().getBlockZ()+j)); //p.sendMessage(ChatColor.DARK_PURPLE+"You feel a dark presence nearby."); + Bukkit.getPlayer("sigonasr2").sendMessage("Trigger this."); zombie.setRemoveWhenFarAway(false); zombie.setMaxHealth(300); zombie.setHealth(300); @@ -1505,7 +1506,7 @@ public void runTick() { //l.setCustomNameVisible(true); l.setMaxHealth(l.getMaxHealth()+20); } - l.setHealth(l.getMaxHealth()*0.95d); + l.setHealth(l.getMaxHealth()); } else { if (Math.random()<=0.10+((heightmodifier-l.getLocation().getY())*0.01d)) { if (Math.random()<=0.25) { @@ -1521,8 +1522,8 @@ public void runTick() { l.getEquipment().setHelmet(new ItemStack(Material.AIR)); Zombie g = (Zombie)l; g.setBaby(true); - //l.setMaxHealth(l.getMaxHealth()+20); - l.setHealth(l.getMaxHealth()*0.65d); + l.setMaxHealth(l.getMaxHealth()*0.65d); + l.setHealth(l.getMaxHealth()); } } } diff --git a/BankEconomyMod/src/me/kaZep/Base/PlayerListener.java b/BankEconomyMod/src/me/kaZep/Base/PlayerListener.java index 24a4b0b..5ecc3a6 100644 --- a/BankEconomyMod/src/me/kaZep/Base/PlayerListener.java +++ b/BankEconomyMod/src/me/kaZep/Base/PlayerListener.java @@ -1912,6 +1912,8 @@ public class PlayerListener boolean despawn=true; if (entity instanceof Monster) { LivingEntity test = (LivingEntity)entity; + test.setMaxHealth(10); + test.setHealth(test.getMaxHealth()); boolean block=false; if (test.getCustomName()!=null && (test.getCustomName().contains(ChatColor.DARK_PURPLE+"") || test.getCustomName().contains(ChatColor.DARK_AQUA+"Polymorphed Creature"))) { for (int i=-2;i<3;i++) { @@ -2753,7 +2755,7 @@ public class PlayerListener //Wear diamond armor almost always. Enchanted diamond pieces here and there. if (entity.getType()==EntityType.SKELETON || entity.getType()==EntityType.ZOMBIE) { LivingEntity l = (LivingEntity) entity; - l.addPotionEffect(new PotionEffect(PotionEffectType.HEALTH_BOOST,999999,1)); + //l.addPotionEffect(new PotionEffect(PotionEffectType.HEALTH_BOOST,999999,1)); l.addPotionEffect(new PotionEffect(PotionEffectType.SPEED,999999,1)); l.addPotionEffect(new PotionEffect(PotionEffectType.DAMAGE_RESISTANCE,999999,0)); l.addPotionEffect(new PotionEffect(PotionEffectType.FIRE_RESISTANCE,999999,0)); @@ -6343,14 +6345,22 @@ public ItemStack getGoodie() { if (m.getType()!=EntityType.ENDER_DRAGON && m.getType()!=EntityType.WITHER) { if (m.getCustomName()==null) { if (m.getMaxHealth()>65) { + Bukkit.broadcastMessage("This mob had too much HP. HP: "+m.getMaxHealth()); m.setMaxHealth(65); //65 HP cap. - m.setHealth(m.getMaxHealth()); + m.setHealth(65); + m.setCustomName("Super Mob"); + m.setCustomNameVisible(true); + Bukkit.broadcastMessage("This mob had too much HP. Lowered to "+m.getHealth()+"/"+m.getMaxHealth()); } } else { if (!m.getCustomName().contains(ChatColor.DARK_PURPLE+"")) { //Make sure it's not a boss. if (m.getMaxHealth()>65) { + Bukkit.broadcastMessage("This mob had too much HP. HP: "+m.getMaxHealth()); m.setMaxHealth(65); //65 HP cap. - m.setHealth(m.getMaxHealth()); + m.setHealth(65); + m.setCustomName("Super Mob"); + m.setCustomNameVisible(true); + Bukkit.broadcastMessage("This mob had too much HP. Lowered to "+m.getHealth()+"/"+m.getMaxHealth()); } } } @@ -6363,14 +6373,22 @@ public ItemStack getGoodie() { if (m.getType()!=EntityType.ENDER_DRAGON && m.getType()!=EntityType.WITHER) { if (m.getCustomName()==null) { if (m.getMaxHealth()>65) { + Bukkit.broadcastMessage("This mob had too much HP. HP: "+m.getMaxHealth()); m.setMaxHealth(65); //65 HP cap. - m.setHealth(m.getMaxHealth()); + //m.setHealth(65); + m.setCustomName("Super Mob"); + m.setCustomNameVisible(true); + Bukkit.broadcastMessage("This mob had too much HP. Lowered to "+m.getHealth()+"/"+m.getMaxHealth()); } } else { if (!m.getCustomName().contains(ChatColor.DARK_PURPLE+"")) { //Make sure it's not a boss. if (m.getMaxHealth()>65) { + Bukkit.broadcastMessage("This mob had too much HP. HP: "+m.getMaxHealth()); m.setMaxHealth(65); //65 HP cap. - m.setHealth(m.getMaxHealth()); + m.setHealth(65); + m.setCustomName("Super Mob"); + m.setCustomNameVisible(true); + Bukkit.broadcastMessage("This mob had too much HP. Lowered to "+m.getHealth()+"/"+m.getMaxHealth()); } } } @@ -6378,6 +6396,7 @@ public ItemStack getGoodie() { } final LivingEntity l = (LivingEntity)e.getEntity(); if (l.getCustomName()!=null && l.getCustomName().contains(ChatColor.DARK_PURPLE+"")) { + Bukkit.getPlayer("sigonasr2").sendMessage("Entered Boss Entity hit loop."); Bukkit.getScheduler().scheduleSyncDelayedTask(this.plugin, new Runnable() { @Override public void run() { @@ -10631,25 +10650,6 @@ public void onEntityExpode(ExplosionPrimeEvent e) { } } } - List nearby = p.getNearbyEntities(30, 30, 30); - for (int i=0;i nearby = p.getNearbyEntities(30, 30, 30); + for (int i=0;i