Update Gateway.java and HackEventHandler.java