Fix unkillable super zombies.

master_event
sigonasr2 11 years ago
parent f3994f0269
commit 01a8ab6398
  1. 12
      BankEconomyMod/src/me/kaZep/Base/PlayerListener.java

@ -6755,10 +6755,9 @@ public ItemStack getGoodie() {
} }
if (e.getEntity().getType()==EntityType.ZOMBIE) { if (e.getEntity().getType()==EntityType.ZOMBIE) {
Zombie z = (Zombie)e.getEntity(); Zombie z = (Zombie)e.getEntity();
if (z.getCustomName()==null && z.getMaxHealth()>65) { if (z.getCustomName()==null && z.getHealth()>65) {
//If it's a normal zombie with too much HP, something wrong. Lower it. //If it's a normal zombie with too much HP, something's wrong. Lower it.
z.setMaxHealth(65); z.setHealth(65-z.getMaxHealth()/2);
z.setHealth(z.getMaxHealth());
} }
} }
if (e.getDamager() instanceof Projectile) { if (e.getDamager() instanceof Projectile) {
@ -10329,7 +10328,7 @@ public ItemStack getGoodie() {
@EventHandler @EventHandler
public void onMinecartExit(VehicleExitEvent e) { public void onMinecartExit(VehicleExitEvent e) {
if (e.getVehicle().getType()==EntityType.MINECART && e.getVehicle().getPassenger().getType()==EntityType.PLAYER && ((Player)e.getVehicle().getPassenger()).isOnline()) { if (e.getVehicle().getType()==EntityType.MINECART && e.getVehicle().getPassenger().getType()==EntityType.PLAYER) {
Bukkit.getWorld("world").dropItemNaturally(e.getVehicle().getLocation(),new ItemStack(Material.MINECART)); Bukkit.getWorld("world").dropItemNaturally(e.getVehicle().getLocation(),new ItemStack(Material.MINECART));
e.getVehicle().remove(); e.getVehicle().remove();
} }
@ -10848,6 +10847,9 @@ public void onEntityExpode(ExplosionPrimeEvent e) {
@EventHandler @EventHandler
public void onPlayerLeave(PlayerQuitEvent e) { public void onPlayerLeave(PlayerQuitEvent e) {
Player p = e.getPlayer(); Player p = e.getPlayer();
if (p.isInsideVehicle()) {
p.leaveVehicle();
}
for (int i=0;i<this.plugin.SPEED_CONTROL.size();i++) { for (int i=0;i<this.plugin.SPEED_CONTROL.size();i++) {
if (this.plugin.SPEED_CONTROL.get(i).p.getName().compareTo(p.getName())==0) { if (this.plugin.SPEED_CONTROL.get(i).p.getName().compareTo(p.getName())==0) {
p.removePotionEffect(PotionEffectType.SPEED); p.removePotionEffect(PotionEffectType.SPEED);

Loading…
Cancel
Save