diff --git a/BankEconomyMod/bin/me/kaZep/Base/EnchantLevelDatabase.class b/BankEconomyMod/bin/me/kaZep/Base/EnchantLevelDatabase.class index 43a3f84..f0aea34 100644 Binary files a/BankEconomyMod/bin/me/kaZep/Base/EnchantLevelDatabase.class and b/BankEconomyMod/bin/me/kaZep/Base/EnchantLevelDatabase.class differ diff --git a/BankEconomyMod/bin/me/kaZep/Base/Main$1.class b/BankEconomyMod/bin/me/kaZep/Base/Main$1.class index 2a6ea0d..b8f16dd 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 1c1d834..0236ead 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 ace5ce9..87cbc93 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 3346601..08a4636 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/PlayerBuffData.class b/BankEconomyMod/bin/me/kaZep/Base/PlayerBuffData.class index a97c5a6..929231e 100644 Binary files a/BankEconomyMod/bin/me/kaZep/Base/PlayerBuffData.class and b/BankEconomyMod/bin/me/kaZep/Base/PlayerBuffData.class differ diff --git a/BankEconomyMod/bin/me/kaZep/Base/PlayerListener$1.class b/BankEconomyMod/bin/me/kaZep/Base/PlayerListener$1.class index fe07663..923ac6f 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$10.class b/BankEconomyMod/bin/me/kaZep/Base/PlayerListener$10.class index 255e259..571d51c 100644 Binary files a/BankEconomyMod/bin/me/kaZep/Base/PlayerListener$10.class and b/BankEconomyMod/bin/me/kaZep/Base/PlayerListener$10.class differ diff --git a/BankEconomyMod/bin/me/kaZep/Base/PlayerListener$11.class b/BankEconomyMod/bin/me/kaZep/Base/PlayerListener$11.class index 51d834c..b1c15f3 100644 Binary files a/BankEconomyMod/bin/me/kaZep/Base/PlayerListener$11.class and b/BankEconomyMod/bin/me/kaZep/Base/PlayerListener$11.class differ diff --git a/BankEconomyMod/bin/me/kaZep/Base/PlayerListener$12.class b/BankEconomyMod/bin/me/kaZep/Base/PlayerListener$12.class index d99c3c2..86dee30 100644 Binary files a/BankEconomyMod/bin/me/kaZep/Base/PlayerListener$12.class and b/BankEconomyMod/bin/me/kaZep/Base/PlayerListener$12.class differ diff --git a/BankEconomyMod/bin/me/kaZep/Base/PlayerListener$13.class b/BankEconomyMod/bin/me/kaZep/Base/PlayerListener$13.class index b63ec24..c80042b 100644 Binary files a/BankEconomyMod/bin/me/kaZep/Base/PlayerListener$13.class and b/BankEconomyMod/bin/me/kaZep/Base/PlayerListener$13.class differ diff --git a/BankEconomyMod/bin/me/kaZep/Base/PlayerListener$14.class b/BankEconomyMod/bin/me/kaZep/Base/PlayerListener$14.class index d327849..ffcb4d6 100644 Binary files a/BankEconomyMod/bin/me/kaZep/Base/PlayerListener$14.class and b/BankEconomyMod/bin/me/kaZep/Base/PlayerListener$14.class differ diff --git a/BankEconomyMod/bin/me/kaZep/Base/PlayerListener$15.class b/BankEconomyMod/bin/me/kaZep/Base/PlayerListener$15.class index a809be5..c40cef7 100644 Binary files a/BankEconomyMod/bin/me/kaZep/Base/PlayerListener$15.class and b/BankEconomyMod/bin/me/kaZep/Base/PlayerListener$15.class differ diff --git a/BankEconomyMod/bin/me/kaZep/Base/PlayerListener$16.class b/BankEconomyMod/bin/me/kaZep/Base/PlayerListener$16.class index 7604ea3..58242e2 100644 Binary files a/BankEconomyMod/bin/me/kaZep/Base/PlayerListener$16.class and b/BankEconomyMod/bin/me/kaZep/Base/PlayerListener$16.class differ diff --git a/BankEconomyMod/bin/me/kaZep/Base/PlayerListener$17.class b/BankEconomyMod/bin/me/kaZep/Base/PlayerListener$17.class index ff40f4a..54475b3 100644 Binary files a/BankEconomyMod/bin/me/kaZep/Base/PlayerListener$17.class and b/BankEconomyMod/bin/me/kaZep/Base/PlayerListener$17.class differ diff --git a/BankEconomyMod/bin/me/kaZep/Base/PlayerListener$2.class b/BankEconomyMod/bin/me/kaZep/Base/PlayerListener$2.class index 2a7c48a..47ee437 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 9d7e362..2bc9bfa 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 99a9665..5544ce0 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 60d5471..487f2bf 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 5a10f9d..6bb07bf 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$7.class b/BankEconomyMod/bin/me/kaZep/Base/PlayerListener$7.class index 786cca0..efee20a 100644 Binary files a/BankEconomyMod/bin/me/kaZep/Base/PlayerListener$7.class and b/BankEconomyMod/bin/me/kaZep/Base/PlayerListener$7.class differ diff --git a/BankEconomyMod/bin/me/kaZep/Base/PlayerListener$8.class b/BankEconomyMod/bin/me/kaZep/Base/PlayerListener$8.class index 06d8d8e..156b163 100644 Binary files a/BankEconomyMod/bin/me/kaZep/Base/PlayerListener$8.class and b/BankEconomyMod/bin/me/kaZep/Base/PlayerListener$8.class differ diff --git a/BankEconomyMod/bin/me/kaZep/Base/PlayerListener$9.class b/BankEconomyMod/bin/me/kaZep/Base/PlayerListener$9.class index 4acc4b1..b662bd1 100644 Binary files a/BankEconomyMod/bin/me/kaZep/Base/PlayerListener$9.class and b/BankEconomyMod/bin/me/kaZep/Base/PlayerListener$9.class differ diff --git a/BankEconomyMod/bin/me/kaZep/Commands/commandBankEconomy$1.class b/BankEconomyMod/bin/me/kaZep/Commands/commandBankEconomy$1.class index 595cd70..6bb896c 100644 Binary files a/BankEconomyMod/bin/me/kaZep/Commands/commandBankEconomy$1.class and b/BankEconomyMod/bin/me/kaZep/Commands/commandBankEconomy$1.class differ diff --git a/BankEconomyMod/bin/me/kaZep/Commands/commandBankEconomy$2.class b/BankEconomyMod/bin/me/kaZep/Commands/commandBankEconomy$2.class index 3cd836b..bd4aec7 100644 Binary files a/BankEconomyMod/bin/me/kaZep/Commands/commandBankEconomy$2.class and b/BankEconomyMod/bin/me/kaZep/Commands/commandBankEconomy$2.class differ diff --git a/BankEconomyMod/bin/me/kaZep/Commands/commandBankEconomy$3.class b/BankEconomyMod/bin/me/kaZep/Commands/commandBankEconomy$3.class index 5ce8701..92338d0 100644 Binary files a/BankEconomyMod/bin/me/kaZep/Commands/commandBankEconomy$3.class and b/BankEconomyMod/bin/me/kaZep/Commands/commandBankEconomy$3.class differ diff --git a/BankEconomyMod/bin/me/kaZep/Commands/commandBankEconomy$4.class b/BankEconomyMod/bin/me/kaZep/Commands/commandBankEconomy$4.class index c6bc769..7ab6f2c 100644 Binary files a/BankEconomyMod/bin/me/kaZep/Commands/commandBankEconomy$4.class and b/BankEconomyMod/bin/me/kaZep/Commands/commandBankEconomy$4.class differ diff --git a/BankEconomyMod/bin/me/kaZep/Commands/commandBankEconomy$5.class b/BankEconomyMod/bin/me/kaZep/Commands/commandBankEconomy$5.class index 109669f..431ea81 100644 Binary files a/BankEconomyMod/bin/me/kaZep/Commands/commandBankEconomy$5.class and b/BankEconomyMod/bin/me/kaZep/Commands/commandBankEconomy$5.class differ diff --git a/BankEconomyMod/bin/me/kaZep/Commands/commandBankEconomy$6.class b/BankEconomyMod/bin/me/kaZep/Commands/commandBankEconomy$6.class index a2e02fa..396f52b 100644 Binary files a/BankEconomyMod/bin/me/kaZep/Commands/commandBankEconomy$6.class and b/BankEconomyMod/bin/me/kaZep/Commands/commandBankEconomy$6.class differ diff --git a/BankEconomyMod/bin/me/kaZep/Commands/commandBankEconomy.class b/BankEconomyMod/bin/me/kaZep/Commands/commandBankEconomy.class index 5fceb0e..4b76270 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/PlayerListener.java b/BankEconomyMod/src/me/kaZep/Base/PlayerListener.java index e5b5a5d..1d3eb44 100644 --- a/BankEconomyMod/src/me/kaZep/Base/PlayerListener.java +++ b/BankEconomyMod/src/me/kaZep/Base/PlayerListener.java @@ -6840,14 +6840,13 @@ implements Listener if (e.getEntity() instanceof Wither) { e.setDamage(e.getDamage()*0.075d); } - if (e.getEntity().getType()==EntityType.ZOMBIE) { - Zombie z = (Zombie)e.getEntity(); - if (z.getCustomName()==null && z.getMaxHealth()>65) { - //If it's a normal zombie with too much HP, something wrong. Lower it. - z.setMaxHealth(65); - z.setHealth(z.getMaxHealth()); - } - } + if (e.getEntity().getType()==EntityType.ZOMBIE) { + Zombie z = (Zombie)e.getEntity(); + if (z.getCustomName()==null && z.getHealth()>65) { + //If it's a normal zombie with too much HP, something's wrong. Lower it. + z.setHealth(65-z.getMaxHealth()/2); + } + } if (e.getDamager() instanceof Projectile) { Projectile pp = (Projectile)(e.getDamager()); if (pp.getShooter() instanceof Player && l instanceof Wither) { @@ -10693,10 +10692,10 @@ implements Listener @EventHandler public void onMinecartExit(VehicleExitEvent e) { - if (e.getVehicle().getType()==EntityType.MINECART && e.getVehicle().getPassenger().getType()==EntityType.PLAYER && ((Player)e.getVehicle().getPassenger()).isOnline()) { - Bukkit.getWorld("world").dropItemNaturally(e.getVehicle().getLocation(),new ItemStack(Material.MINECART)); - e.getVehicle().remove(); - } + if (e.getVehicle().getType()==EntityType.MINECART && e.getVehicle().getPassenger().getType()==EntityType.PLAYER) { + Bukkit.getWorld("world").dropItemNaturally(e.getVehicle().getLocation(),new ItemStack(Material.MINECART)); + e.getVehicle().remove(); + } } @EventHandler @@ -11212,6 +11211,9 @@ implements Listener @EventHandler public void onPlayerLeave(PlayerQuitEvent e) { Player p = e.getPlayer(); + if (p.isInsideVehicle()) { + p.leaveVehicle(); + } for (int i=0;i