Ported to 1.5.2 Vanilla

Client only