Merge branch 'engine-fixes'

Author: TheApplePieGod

engine/src/main/battlecode/world/GameWorld.java

@@ -389,8 +389,8 @@ public void triggerTrap(Trap trap, InternalRobot robot, boolean entered){
         switch(type){
             case STUN:
                 for (InternalRobot rob : getAllRobotsWithinRadiusSquared(loc, type.enterRadius, trap.getTeam().opponent())){
-                    rob.setMovementCooldownTurns(40);
-                    rob.setActionCooldownTurns(40);
+                    rob.setMovementCooldownTurns(type.opponentCooldown);
+                    rob.setActionCooldownTurns(type.opponentCooldown);
                 }
                 break;
             case EXPLOSIVE: