adapted to new AmmarServer changes