Merge branch 'dev' into devAnvil

Conflicts:
	BankEconomyMod/src/me/kaZep/Base/PlayerListener.java

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<this.plugin.SPEED_CONTROL.size();i++) {
 			if (this.plugin.SPEED_CONTROL.get(i).p.getName().compareTo(p.getName())==0) {
 				p.removePotionEffect(PotionEffectType.SPEED);