Check instanceof CraftEntity in a few more places