Made Entity client input handlers more secure